[Box Backup-commit] COMMIT r1713 - box/chris/merge/test/bbackupd

[boxbackup-dev at fluffy.co.uk]

Author: chris
Date: 2007-06-30 15:17:17 +0100 (Sat, 30 Jun 2007)
New Revision: 1713

Modified:
   box/chris/merge/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)


Modified: box/chris/merge/test/bbackupd/testbbackupd.cpp
===================================================================
--- box/chris/merge/test/bbackupd/testbbackupd.cpp	2007-06-30 13:32:53 UTC (rev 1712)
+++ box/chris/merge/test/bbackupd/testbbackupd.cpp	2007-06-30 14:17:17 UTC (rev 1713)
@@ -841,7 +841,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));
@@ -850,9 +851,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);
 		}
@@ -892,7 +893,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");
 
@@ -902,7 +904,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())
@@ -944,7 +946,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");
 
@@ -964,7 +967,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())