Changeset 2291 for box/trunk/test

Timestamp:

26/09/2008 21:18:13 (4 years ago)

Author:

chris

Message:

Reinstate and fix the intercept tests for SSL keepalives.

File:

• box/trunk/test/bbackupd/testbbackupd.cpp (modified) (4 diffs)

box/trunk/test/bbackupd/testbbackupd.cpp

@@ -706 +706 @@
         
         // ensure that no child processes end up running tests!
-        TEST_EQUAL(own_pid, getpid(), "Forking test problem");
         if (getpid() != own_pid)
         {
                 // abort!
-                _exit(1);
+                BOX_INFO("Daemon child finished, exiting now.");
+                _exit(0);
         }
 
@@ -744 +744 @@
 bool stop_internal_daemon(int pid)
 {
-        bool killed_server = KillServer(pid, true);
+        bool killed_server = KillServer(pid, false);
         TEST_THAT(killed_server);
         return killed_server;
@@ -893 +893 @@
                         "| ( cd testfiles/TestDir1 && tar xf - )") == 0);
         #endif
-        
-#if 1
-// #ifdef PLATFORM_CLIB_FNS_INTERCEPTION_IMPOSSIBLE
+
+#ifdef PLATFORM_CLIB_FNS_INTERCEPTION_IMPOSSIBLE
         printf("\n==== Skipping intercept-based KeepAlive tests "
                 "on this platform.\n");
@@ -2549 +2548 @@
                                 > 1024);
                 }
-        
+
                 // wait for backup daemon to do it's stuff, and compare again
                 wait_for_backup_operation();