[Box Backup-commit] COMMIT r1743 - box/chris/general/test/bbackupd

[boxbackup-dev@fluffy.co.uk]

Author: chris
Date: 2007-07-26 22:37:12 +0100 (Thu, 26 Jul 2007)
New Revision: 1743

Modified:
   box/chris/general/test/bbackupd/testbbackupd.cpp
Log:
Make test/bbackupd intercept timer tests a little less strict, because
object IDs can vary depending on the order that readdir() returns files
in. (refs #3, merges [1713])


Modified: box/chris/general/test/bbackupd/testbbackupd.cpp
===================================================================
--- box/chris/general/test/bbackupd/testbbackupd.cpp	2007-07-26 21:36:12 UTC (rev 1742)
+++ box/chris/general/test/bbackupd/testbbackupd.cpp	2007-07-26 21:37:12 UTC (rev 1743)
@@ -838,7 +838,8 @@
 		{
 			std::string line;
 			TEST_THAT(reader.GetLine(line));
-			TEST_THAT(line == "Receive Success(0xe)");
+			std::string comp = "Receive Success(0x";
+			TEST_THAT(line.substr(0, comp.size()) == comp);
 			TEST_THAT(reader.GetLine(line));
 			TEST_THAT(line == "Receiving stream, size 124");
 			TEST_THAT(reader.GetLine(line));
@@ -847,9 +848,9 @@
 			TEST_THAT(line == "Receive IsAlive()");
 
 			TEST_THAT(reader.GetLine(line));
-			std::string comp = "Send StoreFile(0x3,";
+			comp = "Send StoreFile(0x3,";
 			TEST_THAT(line.substr(0, comp.size()) == comp);
-			comp = ",0xe,\"f1\")";
+			comp = ",\"f1\")";
 			TEST_THAT(line.substr(line.size() - comp.size())
 				== comp);
 		}
@@ -889,7 +890,8 @@
 		{
 			std::string line;
 			TEST_THAT(reader.GetLine(line));
-			TEST_THAT(line == "Receive Success(0xf)");
+			std::string comp = "Receive Success(0x";
+			TEST_THAT(line.substr(0, comp.size()) == comp);
 			TEST_THAT(reader.GetLine(line));
 			TEST_THAT(line == "Receiving stream, size 124");
 
@@ -899,7 +901,7 @@
 			// so there will be no keepalives.
 
 			TEST_THAT(reader.GetLine(line));
-			std::string comp = "Send StoreFile(0x3,";
+			comp = "Send StoreFile(0x3,";
 			TEST_THAT(line.substr(0, comp.size()) == comp);
 			comp = ",0x0,\"f1\")";
 			TEST_THAT(line.substr(line.size() - comp.size())
@@ -941,7 +943,8 @@
 		{
 			std::string line;
 			TEST_THAT(reader.GetLine(line));
-			TEST_THAT(line == "Receive Success(0x10)");
+			std::string comp = "Receive Success(0x";
+			TEST_THAT(line.substr(0, comp.size()) == comp);
 			TEST_THAT(reader.GetLine(line));
 			TEST_THAT(line == "Receiving stream, size 124");
 
@@ -961,7 +964,7 @@
 			TEST_THAT(line == "Receive IsAlive()");
 
 			TEST_THAT(reader.GetLine(line));
-			std::string comp = "Send StoreFile(0x3,";
+			comp = "Send StoreFile(0x3,";
 			TEST_THAT(line.substr(0, comp.size()) == comp);
 			comp = ",0x0,\"f1\")";
 			TEST_THAT(line.substr(line.size() - comp.size())