[Box Backup-commit] COMMIT r1909 - box/trunk/test/backupstorefix

boxbackup-dev@fluffy.co.uk boxbackup-dev@fluffy.co.uk
Sun, 04 Nov 2007 03:24:58 +0000


Author: chris
Date: 2007-11-04 03:24:58 +0000 (Sun, 04 Nov 2007)
New Revision: 1909

Modified:
   box/trunk/test/backupstorefix/testbackupstorefix.cpp
Log:
Explicitly wait for sync to finish instead of assuming that 14 seconds
is enough time.


Modified: box/trunk/test/backupstorefix/testbackupstorefix.cpp
===================================================================
--- box/trunk/test/backupstorefix/testbackupstorefix.cpp	2007-11-04 03:24:11 UTC (rev 1908)
+++ box/trunk/test/backupstorefix/testbackupstorefix.cpp	2007-11-04 03:24:58 UTC (rev 1909)
@@ -316,11 +316,11 @@
 
 		if(bbackupd_pid > 0)
 		{
-			::sleep(1);
+			::safe_sleep(1);
 			TEST_THAT(ServerIsAlive(bbackupd_pid));
 	
 			// Create a nice store directory
-			wait_for_operation(14);
+			::sync_and_wait();
 
 			// That'll do nicely, stop the server	
 			#ifdef WIN32