Changeset 2838 for box/trunk/test

Timestamp:

09/01/2011 11:54:00 (17 months ago)

Author:

chris

Message:

Add intercept logging, seems to work around intermittent failures in
testbbackupd:

Waiting for internal daemon to scan spacetest/d1: ............ done.
Waiting for server to die (pid 6307): .............................. failed!
ERROR:   **** TEST FAILURE: Condition [killed_server] failed at testbbackupd.cpp:718
ERROR:   **** TEST FAILURE: Condition [stop_internal_daemon(pid)] failed at testbbackupd.cpp:1153

File:

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

box/trunk/test/bbackupd/testbbackupd.cpp

@@ -750 +750 @@
 extern "C" struct dirent *readdir_test_hook_2(DIR *dir)
 {
-        if (time(NULL) >= readdir_stop_time)
+        time_t time_now = time(NULL);
+
+        if (time_now >= readdir_stop_time)
         {
 #ifndef PLATFORM_CLIB_FNS_INTERCEPTION_IMPOSSIBLE
+                BOX_NOTICE("Cancelling readdir hook at " << time_now);
                 intercept_setup_readdir_hook(NULL, NULL);
                 intercept_setup_lstat_hook  (NULL, NULL);
                 // we will not be called again.
+#else
+                BOX_NOTICE("Failed to cancel readdir hook at " << time_now);
 #endif
+        }
+        else
+        {
+                BOX_INFO("readdir hook still active at " << time_now << ", "
+                        "waiting for " << readdir_stop_time);
         }
 
@@ -769 +779 @@
                 sizeof(readdir_test_dirent.d_name),
                 "test.%d", readdir_test_counter);
+        BOX_INFO("readdir hook returning " << readdir_test_dirent.d_name);
 
         // ensure that when bbackupd stats the file, it gets the