Changeset 2000 for box/trunk/test

Timestamp:

15/12/2007 17:04:24 (4 years ago)

Author:

chris

Message:

Report line of test where failed to kill internal daemon during SSL
keepalive tests.

File:

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

box/trunk/test/bbackupd/testbbackupd.cpp

@@ -702 +702 @@
 }
 
-void stop_internal_daemon(int pid)
+bool stop_internal_daemon(int pid)
 {
-        TEST_THAT(KillServer(pid));
+        bool killed_server = KillServer(pid);
+        TEST_THAT(killed_server);
+        return killed_server;
 
         /*
@@ -845 +847 @@
                 int pid = start_internal_daemon();
                 wait_for_backup_operation();
-                stop_internal_daemon(pid);
+                TEST_THAT(stop_internal_daemon(pid));
 
                 // two-second delay on the first read() of f1
@@ -866 +868 @@
                 // it's in a different process.
                 // TEST_THAT(intercept_triggered());
-                stop_internal_daemon(pid);
+                TEST_THAT(stop_internal_daemon(pid));
 
                 // check that keepalive was written to logs, and
@@ -936 +938 @@
                 // it's in a different process.
                 // TEST_THAT(intercept_triggered());
-                stop_internal_daemon(pid);
+                TEST_THAT(stop_internal_daemon(pid));
 
                 // check that the diff was aborted, i.e. upload was not a diff
@@ -996 +998 @@
                 // it's in a different process.
                 // TEST_THAT(intercept_triggered());
-                stop_internal_daemon(pid);
+                TEST_THAT(stop_internal_daemon(pid));
 
                 // check that the diff was aborted, i.e. upload was not a diff
@@ -1080 +1082 @@
                 // it's in a different process.
                 // TEST_THAT(intercept_triggered());
-                stop_internal_daemon(pid);
+                TEST_THAT(stop_internal_daemon(pid));
 
                 // check that keepalives were sent during the dir search