Changeset 1941

Timestamp:

06/12/2007 08:52:33 (4 years ago)

Author:

chris

Message:

Fix keepalive test failure:

• zero memory buffer before use to keep consistent behaviour.

• expect a diff even if the maximum diffing time expires

• really check when we have a diff and when we don't

File:

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

box/trunk/test/bbackupd/testbbackupd.cpp

@@ -79 +79 @@
 // two cycles and a bit
 #define TIME_TO_WAIT_FOR_BACKUP_OPERATION       12
+
+// utility macro for comparing two strings in a line
+#define TEST_EQUAL(expected, found, line) \
+{ \
+        std::string exp_str = expected; \
+        std::string found_str = found; \
+        TEST_THAT(exp_str == found_str); \
+        if(exp_str != found_str) \
+        { \
+                printf("Expected <%s> but found <%s> in <%s>\n", \
+                        exp_str.c_str(), found_str.c_str(), line.c_str()); \
+        } \
+}
+
+// utility macro for testing a line
+#define TEST_LINE(condition, line) \
+        TEST_THAT(condition); \
+        if (!(condition)) \
+        { \
+                printf("Test failed on <%s>\n", line.c_str()); \
+        }
 
 void wait_for_backup_operation(int seconds = TIME_TO_WAIT_FOR_BACKUP_OPERATION)
@@ -814 +835 @@
                 int fd = open("testfiles/TestDir1/spacetest/f1", O_WRONLY);
                 TEST_THAT(fd > 0);
+
                 char buffer[10000];
+                memset(buffer, 0, sizeof(buffer));
+
                 TEST_THAT(write(fd, buffer, sizeof(buffer)) == sizeof(buffer));
                 TEST_THAT(close(fd) == 0);
@@ -822 +846 @@
                 stop_internal_daemon(pid);
 
+                // two-second delay on the first read() of f1
+                // should mean that a single keepalive is sent,
+                // and diff does not abort.
                 intercept_setup_delay("testfiles/TestDir1/spacetest/f1", 
                         0, 2000, SYS_read, 1);
@@ -863 +890 @@
                         TEST_THAT(reader.GetLine(line));
                         std::string comp = "Receive Success(0x";
-                        TEST_THAT(line.substr(0, comp.size()) == comp);
+                        TEST_EQUAL(comp, line.substr(0, comp.size()), line);
                         TEST_THAT(reader.GetLine(line));
-                        TEST_THAT(line == "Receiving stream, size 124");
+                        TEST_EQUAL("Receiving stream, size 124", line, line);
                         TEST_THAT(reader.GetLine(line));
-                        TEST_THAT(line == "Send GetIsAlive()");
+                        TEST_EQUAL("Send GetIsAlive()", line, line);
                         TEST_THAT(reader.GetLine(line));
-                        TEST_THAT(line == "Receive IsAlive()");
+                        TEST_EQUAL("Receive IsAlive()", line, line);
 
                         TEST_THAT(reader.GetLine(line));
                         comp = "Send StoreFile(0x3,";
-                        TEST_THAT(line.substr(0, comp.size()) == comp);
+                        TEST_EQUAL(comp, line.substr(0, comp.size()), line);
                         comp = ",\"f1\")";
                         std::string sub = line.substr(line.size() - comp.size());
-
-                        TEST_THAT(sub == comp);
-                        if (sub != comp)
-                        {
-                                printf("Expected <%s> but found <%s> in <%s>\n",
-                                        comp.c_str(), sub.c_str(), line.c_str());
-                        }
+                        TEST_EQUAL(comp, sub, line);
+                        std::string comp2 = ",0x0,";
+                        sub = line.substr(line.size() - comp.size() -
+                                comp2.size() + 1, comp2.size());
+                        TEST_LINE(comp2 != sub, line);
                 }
                 
@@ -892 +917 @@
                 }
 
+                // four-second delay on first read() of f1
+                // should mean that no keepalives were sent,
+                // because diff was immediately aborted
+                // before any matching blocks could be found.
                 intercept_setup_delay("testfiles/TestDir1/spacetest/f1", 
                         0, 4000, SYS_read, 1);
@@ -939 +968 @@
                         TEST_THAT(reader.GetLine(line));
                         comp = "Send StoreFile(0x3,";
-                        TEST_THAT(line.substr(0, comp.size()) == comp);
+                        TEST_EQUAL(comp, line.substr(0, comp.size()), line);
                         comp = ",0x0,\"f1\")";
                         std::string sub = line.substr(line.size() - comp.size());
-
-                        TEST_THAT(sub == comp);
-                        if (sub != comp)
-                        {
-                                printf("Expected <%s> but found <%s> in <%s>\n",
-                                        comp.c_str(), sub.c_str(), line.c_str());
-                        }
+                        TEST_EQUAL(comp, sub, line);
                 }
 
@@ -1013 +1036 @@
                         TEST_THAT(line == "Receive IsAlive()");
 
-                        // should not be a diff, so previous version
-                        // should be 0x0
+                        // but two matching blocks should have been found
+                        // already, so the upload should be a diff.
 
                         TEST_THAT(reader.GetLine(line));
                         comp = "Send StoreFile(0x3,";
-                        TEST_THAT(line.substr(0, comp.size()) == comp);
-                        comp = ",0x0,\"f1\")";
+                        TEST_EQUAL(comp, line.substr(0, comp.size()), line);
+                        comp = ",\"f1\")";
                         std::string sub = line.substr(line.size() - comp.size());
-
-                        TEST_THAT(sub == comp);
-                        if (sub != comp)
-                        {
-                                printf("Expected <%s> but found <%s> in <%s>\n",
-                                        comp.c_str(), sub.c_str(), line.c_str());
-                        }
+                        TEST_EQUAL(comp, sub, line);
+                        std::string comp2 = ",0x0,";
+                        sub = line.substr(line.size() - comp.size() -
+                                comp2.size() + 1, comp2.size());
+                        TEST_LINE(comp2 != sub, line);
                 }
 
@@ -1096 +1117 @@
                         std::string line;
                         TEST_THAT(reader.GetLine(line));
-                        TEST_THAT(line == "Receive Success(0x3)");
+                        TEST_EQUAL("Receive Success(0x3)", line, line);
                         TEST_THAT(reader.GetLine(line));
-                        TEST_THAT(line == "Receiving stream, size 425");
+                        TEST_EQUAL("Receiving stream, size 425", line, line);
                         TEST_THAT(reader.GetLine(line));
-                        TEST_THAT(line == "Send GetIsAlive()");
+                        TEST_EQUAL("Send GetIsAlive()", line, line);
                         TEST_THAT(reader.GetLine(line));
-                        TEST_THAT(line == "Receive IsAlive()");
+                        TEST_EQUAL("Receive IsAlive()", line, line);
                         TEST_THAT(reader.GetLine(line));
-                        TEST_THAT(line == "Send GetIsAlive()");
+                        TEST_EQUAL("Send GetIsAlive()", line, line);
                         TEST_THAT(reader.GetLine(line));
-                        TEST_THAT(line == "Receive IsAlive()");
+                        TEST_EQUAL("Receive IsAlive()", line, line);
                 }