Changeset 1922

Timestamp:

04/11/2007 21:38:58 (4 years ago)

Author:

chris

Message:

Add some sleeps to ensure that timestamps change enough to invalidate
the directory cache in the store on filesystem with low timestamp
resolution (e.g. OSX).

File:

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

box/trunk/test/backupstore/testbackupstore.cpp

@@ -1212 +1212 @@
                         TEST_THAT(dir.GetAttributes() == attr);
                 }
+
                 // Check that we don't get attributes if we don't ask for them
                 {
@@ -1225 +1226 @@
                         TEST_THAT(!dir.HasAttributes());
                 }
+
+                // sleep to ensure that the timestamp on the file will change
+                ::safe_sleep(1);
+
                 // Change attributes on the directory
                 {
@@ -1263 +1268 @@
                         TEST_THAT(rep->GetObjectID() == uploads[UPLOAD_FILE_TO_MOVE].allocated_objid);
                 }
+
                 // Try some dodgy renames
                 {
@@ -1275 +1281 @@
                                 ConnectionException, Conn_Protocol_UnexpectedReply);
                 }
+
+                // sleep to ensure that the timestamp on the file will change
+                ::safe_sleep(1);
+
                 // Rename within a directory
                 {
@@ -1282 +1292 @@
                                 subdirid, BackupProtocolClientMoveObject::Flags_MoveAllWithSameName, newName);
                 }
+
                 // Check it's all gone from the root directory...
                 {
@@ -1301 +1312 @@
                         }
                 }
+
                 // Check the old and new versions are in the other directory
                 {
@@ -1330 +1342 @@
                         TEST_THAT(foundOld);
                 }
+
                 // make a little bit more of a thing to look at
                 int64_t subsubdirid = 0;
@@ -1353 +1366 @@
                         subsubfileid = stored->GetObjectID();
                 }
+
                 // Query names -- test that invalid stuff returns not found OK
                 {
@@ -1370 +1384 @@
                         TEST_THAT(nameRep->GetNumNameElements() == 0);          
                 }
+
                 // Query names... first, get info for the file
                 {
@@ -1387 +1402 @@
                         }
                 }
+
                 // Query names... secondly, for the directory
                 {
@@ -1686 +1702 @@
         // First, try logging in without an account having been created... just make sure login fails.
 
-        int pid = LaunchServer(BBSTORED " testfiles/bbstored.conf",
-                "testfiles/bbstored.pid");
+        std::string cmd = BBSTORED " " + bbstored_args + 
+                " testfiles/bbstored.conf";
+        int pid = LaunchServer(cmd.c_str(), "testfiles/bbstored.pid");
 
         TEST_THAT(pid != -1 && pid != 0);