Changeset 2369

Timestamp:

29/10/2008 20:55:43 (22 months ago)

Author:

chris

Message:

Use the same ostringstream formatting for protocol logging to file
that we use for standard logging, to fix 64bit platform warnings
reported by Matt Brown.

Files:

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

box/trunk/test/bbackupd/testbbackupd.cpp

@@ -1003 +1003 @@
                 intercept_setup_delay("testfiles/TestDir1/spacetest/f1", 
                         0, 4000, SYS_read, 1);
-                pid = start_internal_daemon();
-                intercept_clear_setup();
-                
-                fd = open("testfiles/TestDir1/spacetest/f1", O_WRONLY);
-                TEST_THAT(fd > 0);
-                // write again, to update the file's timestamp
-                TEST_EQUAL(sizeof(buffer), write(fd, buffer, sizeof(buffer)),
-                        "Buffer write");
-                TEST_THAT(close(fd) == 0);      
-
-                wait_for_backup_operation();
-                // can't test whether intercept was triggered, because
-                // it's in a different process.
-                // TEST_THAT(intercept_triggered());
-                TEST_THAT(stop_internal_daemon(pid));
+                {
+                        Timers::Init();
+                        BackupDaemon bbackupd;
+                        bbackupd.Configure("testfiles/bbackupd.conf");
+                        bbackupd.InitCrypto();
+                
+                        fd = open("testfiles/TestDir1/spacetest/f1", O_WRONLY);
+                        TEST_THAT(fd > 0);
+                        // write again, to update the file's timestamp
+                        TEST_EQUAL(1, write(fd, "z", 1), "Buffer write");
+                        TEST_THAT(close(fd) == 0);
+
+                        // wait long enough to put file into sync window
+                        wait_for_operation(5);
+
+                        bbackupd.RunSyncNow();
+                        TEST_THAT(intercept_triggered());
+                        intercept_clear_setup();
+                        Timers::Cleanup();
+                }
 
                 // check that the diff was aborted, i.e. upload was not a diff
@@ -1175 +1180 @@
                         std::string line;
                         TEST_THAT(reader.GetLine(line));
-                        if (line == "Send ListDirectory(0x3,0xffffffff,0xc,true)")
+                        if (line == "Send ListDirectory(0x3,0xffff,0xc,true)")
                         {
                                 found1 = true;