[Box Backup-commit] COMMIT r2096 - in box/trunk/test: backupstore backupstorefix bbackupd

[boxbackup-dev@fluffy.co.uk]

Author: chris
Date: 2008-03-01 21:32:07 +0000 (Sat, 01 Mar 2008)
New Revision: 2096

Modified:
   box/trunk/test/backupstore/testbackupstore.cpp
   box/trunk/test/backupstorefix/testbackupstorefix.cpp
   box/trunk/test/bbackupd/testbbackupd.cpp
Log:
Delete bbstored PID file after killing the daemon on Windows, as the 
daemon can't clean up after itself.


Modified: box/trunk/test/backupstore/testbackupstore.cpp
===================================================================
--- box/trunk/test/backupstore/testbackupstore.cpp	2008-02-28 18:08:06 UTC (rev 2095)
+++ box/trunk/test/backupstore/testbackupstore.cpp	2008-03-01 21:32:07 UTC (rev 2096)
@@ -1778,9 +1778,12 @@
 		TEST_THAT(KillServer(pid));
 		::sleep(1);
 		TEST_THAT(!ServerIsAlive(pid));
-#ifndef WIN32
-		TestRemoteProcessMemLeaks("bbstored.memleaks");
-#endif
+
+		#ifdef WIN32
+			TEST_THAT(unlink("testfiles/bbstored.pid") == 0);
+		#else
+			TestRemoteProcessMemLeaks("bbstored.memleaks");
+		#endif
 		
 		// Set a new limit on the account -- leave the hard limit 
 		// high to make sure the target for freeing space is the 
@@ -1872,9 +1875,11 @@
 		::sleep(1);
 		TEST_THAT(!ServerIsAlive(pid));
 
-#ifndef WIN32
-		TestRemoteProcessMemLeaks("bbstored.memleaks");
-#endif
+		#ifdef WIN32
+			TEST_THAT(unlink("testfiles/bbstored.pid") == 0);
+		#else
+			TestRemoteProcessMemLeaks("bbstored.memleaks");
+		#endif
 	}
 
 	return 0;
@@ -1911,9 +1916,12 @@
 		TEST_THAT(KillServer(pid));
 		::sleep(1);
 		TEST_THAT(!ServerIsAlive(pid));
-#ifndef WIN32
-		TestRemoteProcessMemLeaks("bbstored.memleaks");
-#endif
+
+		#ifdef WIN32
+			TEST_THAT(unlink("testfiles/bbstored.pid") == 0);
+		#else
+			TestRemoteProcessMemLeaks("bbstored.memleaks");
+		#endif
 	}
 
 

Modified: box/trunk/test/backupstorefix/testbackupstorefix.cpp
===================================================================
--- box/trunk/test/backupstorefix/testbackupstorefix.cpp	2008-02-28 18:08:06 UTC (rev 2095)
+++ box/trunk/test/backupstorefix/testbackupstorefix.cpp	2008-03-01 21:32:07 UTC (rev 2096)
@@ -601,7 +601,10 @@
 		// ------------------------------------------------------------------------------------------------		
 		// Stop server
 		TEST_THAT(KillServer(pid));
-		#ifndef WIN32
+
+		#ifdef WIN32
+			TEST_THAT(unlink("testfiles/bbstored.pid") == 0);
+		#else
 			TestRemoteProcessMemLeaks("bbstored.memleaks");
 		#endif
 	}

Modified: box/trunk/test/bbackupd/testbbackupd.cpp
===================================================================
--- box/trunk/test/bbackupd/testbbackupd.cpp	2008-02-28 18:08:06 UTC (rev 2095)
+++ box/trunk/test/bbackupd/testbbackupd.cpp	2008-03-01 21:32:07 UTC (rev 2096)
@@ -461,7 +461,9 @@
 	::safe_sleep(1);
 	TEST_THAT(!ServerIsAlive(bbstored_pid));
 
-	#ifndef WIN32
+	#ifdef WIN32
+		TEST_THAT(unlink("testfiles/bbstored.pid") == 0);
+	#else
 		TestRemoteProcessMemLeaks("bbstored.memleaks");
 	#endif