Changeset 2096 for box/trunk/test/backupstore/testbackupstore.cpp

Timestamp:

01/03/2008 21:32:07 (4 years ago)

Author:

chris

Message:

Delete bbstored PID file after killing the daemon on Windows, as the
daemon can't clean up after itself.

File:

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

box/trunk/test/backupstore/testbackupstore.cpp

@@ -1779 +1779 @@
                 ::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 
@@ -1873 +1876 @@
                 TEST_THAT(!ServerIsAlive(pid));
 
-#ifndef WIN32
-                TestRemoteProcessMemLeaks("bbstored.memleaks");
-#endif
+                #ifdef WIN32
+                        TEST_THAT(unlink("testfiles/bbstored.pid") == 0);
+                #else
+                        TestRemoteProcessMemLeaks("bbstored.memleaks");
+                #endif
         }
 
@@ -1912 +1917 @@
                 ::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
         }