[Box Backup-commit] COMMIT r1953 - box/chris/general/test/backupstorefix

[boxbackup-dev@fluffy.co.uk]

Author: chris
Date: 2007-12-08 21:51:59 +0000 (Sat, 08 Dec 2007)
New Revision: 1953

Modified:
   box/chris/general/test/backupstorefix/testbackupstorefix.cpp
Log:
Explicitly wait for sync to finish instead of assuming that 14 seconds
is enough time. (merges [1909])


Modified: box/chris/general/test/backupstorefix/testbackupstorefix.cpp
===================================================================
--- box/chris/general/test/backupstorefix/testbackupstorefix.cpp	2007-12-08 21:50:19 UTC (rev 1952)
+++ box/chris/general/test/backupstorefix/testbackupstorefix.cpp	2007-12-08 21:51:59 UTC (rev 1953)
@@ -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