*** empty log message ***

svn path=/trunk/boinc/; revision=1142

test/test_backend.php

@@ -1,12 +1,14 @@
 #! /usr/local/bin/php
 <?php
     // End to end test.  Tests make_work, feeder, scheduling server, client,
-    // file_upload_handler, validator, assimilator, and file_deleter on a
-    // large batch of workunits.  Confirms that credit is correctly granted
-    // and that unneeded files are deleted
+    // file_upload_handler, validator, assimilator, timeout_check, and
+    // file_deleter on a large batch of workunits.  Confirms that credit
+    // is correctly granted and that unneeded files are deleted
 
     include_once("test.inc");
 
+    $retval = 0;
+
     $project = new Project;
     $user = new User();
     $host = new Host($user);
@@ -16,15 +18,15 @@
     $work = new Work($app);
     $work->wu_template = "uc_wu";
     $work->result_template = "uc_result";
-    $work->redundancy = 4;
-    $work->delay_bound = 86400;
+    $work->redundancy = 5;
+    $work->delay_bound = 7;
     array_push($work->input_files, "input");
 
     $project->add_user($user);
     $project->add_app($app);
     $project->add_app_version($app_version);
     $project->install();      // must install projects before adding to hosts
-    $project->install_make_work($work, 100, 5);
+    $project->install_make_work($work, 499, 5);
 
     $host->log_flags = "log_flags.xml";
     $host->add_user($user,$project);
@@ -36,9 +38,9 @@
 
     $project->start_servers();
 
-    // Start by generating a batch of 100 results
-    echo "Generating 100 results... ";
-    while( $project->num_wus_left() < 100 ) sleep(1);
+    // Start by generating a batch of 500 results
+    echo "Generating 500 results... ";
+    while( $project->num_wus_left() < 500 ) sleep(1);
     echo "done.\n";
 
     // Stop the project, deinstall make_work, and install the normal backend components
@@ -48,6 +50,7 @@
     $project->install_file_delete();
     $project->install_validate($app, 5);
     $project->install_feeder();
+    $project->install_timeout_check($app, 5, 5, 0);
 
     while (($pid=exec("pgrep -n make_work")) != null) sleep(1);
 
@@ -58,13 +61,16 @@
     // Run the client until there's no more work
     $host->run("-exit_when_idle -skip_cpu_benchmarks");
 
-    sleep(5);
+    // Give the server 15 seconds to finish assimilating/deleting
+    sleep(15);
 
-    // *** DO TESTS HERE
+    // *** DO CHECKS HERE
     $result->server_state = RESULT_STATE_OVER;
     $result->exit_status = 0;
-    $project->check_results(101, $result);
+    $project->check_results(500, $result);
 
     // Stop the server
     $project->stop();
+
+    exit($retval);
 ?>

test/test_download_backoff.php

@@ -1,7 +1,7 @@
 #! /usr/local/bin/php
 <?php
-//This tests the exponential backoff mechanism on the client in case of downloadURLs going down
-//This test is not automated. It has to be run, and then client.out (in the host directory) must be looked at to examine wether everything is working correctly.    
+// Tests the exponential backoff mechanism on the client for failed downloads
+// This test is not automated. It has to be run, and then client.out (in the host directory) must be looked at to examine wether everything is working correctly.    
     include_once("test.inc");
 
     $project = new Project;
@@ -11,20 +11,15 @@
     $app = new App("upper_case");
     $app_version = new App_Version($app);
 
-    // the following is optional (makes client web download possible)
-    $core_app = new App("core client");
-    $core_app_version = new App_Version($core_app);
-    $project->add_app($core_app);
-    $project->add_app_version($core_app_version);
-
     $project->add_user($user);
     $project->add_app($app);
     $project->add_app_version($app_version);
 
     $project->install();      // must install projects before adding to hosts
+    $project->install_feeder();
 
     $host->log_flags = "log_flags.xml";
-    $host->add_project($project);
+    $host->add_user($user, $project);
     $host->install();
 
     echo "adding work\n";
@@ -33,13 +28,13 @@
     $work->wu_template = "uc_wu";
     $work->result_template = "uc_result";
     $work->redundancy = 2;
-    $work->delay_bound = 10;
     array_push($work->input_files, "input");
     $work->install($project);
 
-    $project->start_feeder();
     //delete the download_dir immediately 
     $project->delete_downloaddir();
+
+    $project->start_servers();
     $pid = $host->run_asynch("-exit_when_idle");
     echo "sleeping 100 secs\n";
     sleep(100);

test/test_rsc.php

@@ -5,6 +5,8 @@
 
     include_once("test.inc");
 
+    $retval = 0;
+
     $project = new Project;
     $user = new User();
     $host = new Host($user);
@@ -38,4 +40,6 @@
 
     $result->server_state = RESULT_STATE_OVER;
     $project->check_results(0, $result);
+
+    exit($retval);
 ?>

test/test_uc.php

@@ -6,6 +6,8 @@
 
     include_once("test.inc");
 
+    $retval = 0;
+
     $project = new Project;
 
     $app = new App("upper_case");
@@ -55,16 +57,30 @@
     $host->run("-exit_when_idle -skip_cpu_benchmarks");
 
     $project->stop();
+    $project->restart();
     $project->validate($app, 2);
     $result->server_state = RESULT_STATE_OVER;
     $result->stderr_out = "APP: upper_case: starting, argc 1";
     $result->exit_status = 0;
-    $project->check_results(10, $result);
+    $project->check_results(2, $result);
     $project->compare_file("uc_wu_0_0", "uc_correct_output");
     $project->compare_file("uc_wu_1_0", "uc_correct_output");
 
-    $project->file_delete();
-    // input file should be gone here
     $project->assimilate($app);
     $project->file_delete();
+    if (file_exists("$project->project_dir/download/input")) {
+        echo "ERROR: File $project->project_dir/download/input still there\n";
+        $retval = -1;
+    }
+    if (file_exists("$project->project_dir/upload/uc_wu_0_0")) {
+        echo "ERROR: File $project->project_dir/upload/uc_wu_0_0 still there\n";
+        $retval = -1;
+    }
+    if (file_exists("$project->project_dir/upload/uc_wu_1_0")) {
+        echo "ERROR: File $project->project_dir/upload/uc_wu_1_0 still there\n";
+        $retval = -1;
+    }
+    $project->stop();
+
+    exit($retval);
 ?>