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

[boxbackup-dev@fluffy.co.uk]

Author: chris
Date: 2007-12-08 23:02:06 +0000 (Sat, 08 Dec 2007)
New Revision: 1970

Modified:
   box/chris/general/test/bbackupd/testbbackupd.cpp
Log:
Re-initialise the timers when aborting test run during SSL KeepAlive
tests, as main() will try to clean them up and we'll get an error
message if they're not initialised. (merges [1936])


Modified: box/chris/general/test/bbackupd/testbbackupd.cpp
===================================================================
--- box/chris/general/test/bbackupd/testbbackupd.cpp	2007-12-08 22:50:37 UTC (rev 1969)
+++ box/chris/general/test/bbackupd/testbbackupd.cpp	2007-12-08 23:02:06 UTC (rev 1970)
@@ -872,7 +872,14 @@
 				comp2.size() + 1, comp2.size());
 			TEST_LINE(comp2 != sub, line);
 		}
-		
+	
+		if (failures > 0)
+		{
+			// stop early to make debugging easier
+			Timers::Init();
+			return 1;
+		}
+	
 		// four-second delay on first read() of f1
 		// should mean that no keepalives were sent,
 		// because diff was immediately aborted
@@ -934,6 +941,7 @@
 		if (failures > 0)
 		{
 			// stop early to make debugging easier
+			Timers::Init();
 			return 1;
 		}
 
@@ -1011,6 +1019,7 @@
 		if (failures > 0)
 		{
 			// stop early to make debugging easier
+			Timers::Init();
 			return 1;
 		}
 
@@ -1089,6 +1098,7 @@
 		if (failures > 0)
 		{
 			// stop early to make debugging easier
+			Timers::Init();
 			return 1;
 		}