Changeset 2083 for box/trunk/test

Timestamp:

31/01/2008 23:53:27 (4 years ago)

Author:

chris

Message:

Add a sleep after every access to the read-only connection, to ensure that
subsequent changes in the other connection get a new whole-second timestamp
and hopefully fix test failures reported by Alex Harper on MacOS X.

File:

• box/trunk/test/backupstore/testbackupstore.cpp (modified) (8 diffs)

box/trunk/test/backupstore/testbackupstore.cpp

@@ -975 +975 @@
                 test_server_1(protocol, protocolReadOnly);
 
+                // sleep to ensure that the timestamp on the file will change
+                ::safe_sleep(1);
+
                 // Create and upload some test files
                 int64_t maxID = 0;
@@ -1049 +1052 @@
 
                         // Use the read only connection to verify that the directory is as we expect
+                        printf("\n\n==== Reading directory using read-only connection\n");
                         check_dir_after_uploads(protocolReadOnly, attrtest);
+                        printf("done.\n\n");
                         // And on the read/write one
                         check_dir_after_uploads(protocol, attrtest);
                 }
                 
+                // sleep to ensure that the timestamp on the file will change
+                ::safe_sleep(1);
+
                 // Check diffing and rsync like stuff...
                 // Build a modified file
@@ -1150 +1158 @@
                         subdirfileid = stored->GetObjectID();
                 }
+
+                printf("\n==== Checking upload using read-only connection\n");
                 // Check the directories on the read only connection
                 {
@@ -1182 +1192 @@
                         TEST_THAT(en->GetModificationTime() == 0);      // dirs don't have modification times.
                 }
+
                 {
                         // Command
@@ -1212 +1223 @@
                         TEST_THAT(dir.GetAttributes() == attr);
                 }
+                printf("done.\n\n");
 
                 // Check that we don't get attributes if we don't ask for them
@@ -1259 +1271 @@
                 }
                 
+                // sleep to ensure that the timestamp on the file will change
+                ::safe_sleep(1);
+
                 // Test moving a file
                 {
@@ -1281 +1296 @@
                                 ConnectionException, Conn_Protocol_UnexpectedReply);
                 }
-
-                // sleep to ensure that the timestamp on the file will change
-                ::safe_sleep(1);
 
                 // Rename within a directory
@@ -1342 +1354 @@
                         TEST_THAT(foundOld);
                 }
+
+                // sleep to ensure that the timestamp on the file will change
+                ::safe_sleep(1);
 
                 // make a little bit more of a thing to look at