Changeset 2510 for box/trunk/test

Timestamp:

26/04/2009 15:39:21 (3 years ago)

Author:

chris

Message:

Log while sleeping in test/bbackupd.

Only show warning about diff test time taken if it's out of bounds.

File:

• box/trunk/test/bbackupd/testbbackupd.cpp (modified) (3 diffs)

box/trunk/test/bbackupd/testbbackupd.cpp

@@ -2444 +2444 @@
                         // 5 seconds (normally about 3 seconds)
 
-                        safe_sleep(1); // 2 seconds before
+                        wait_for_operation(1, "2 seconds before next run");
                         TEST_THAT(stat("testfiles" DIRECTORY_SEPARATOR 
                                 "syncallowscript.notifyran.1", &st) != 0);
-                        safe_sleep(4); // 2 seconds after
+                        wait_for_operation(4, "2 seconds after run");
                         TEST_THAT(stat("testfiles" DIRECTORY_SEPARATOR 
                                 "syncallowscript.notifyran.1", &st) == 0);
@@ -2456 +2456 @@
                         // 10 seconds (normally about 8 seconds)
 
-                        safe_sleep(6); // 2 seconds before
+                        wait_for_operation(6, "2 seconds before next run");
                         TEST_THAT(stat("testfiles" DIRECTORY_SEPARATOR 
                                 "syncallowscript.notifyran.2", &st) != 0);
-                        safe_sleep(4); // 2 seconds after
+                        wait_for_operation(4, "2 seconds after run");
                         TEST_THAT(stat("testfiles" DIRECTORY_SEPARATOR 
                                 "syncallowscript.notifyran.2", &st) == 0);
@@ -2482 +2482 @@
 
                         long wait_time = end_time - start_time + 2;
+
                         // should be about 10 seconds
-                        printf("Waited for %ld seconds, should have been %s",
-                                wait_time, control_string);
+                        if (wait_time < 8 || wait_time > 12)
+                        {
+                                printf("Waited for %ld seconds, should have "
+                                        "been %s", wait_time, control_string);
+                        }
+
                         TEST_THAT(wait_time >= 8);
                         TEST_THAT(wait_time <= 12);