[Box Backup-dev] COMMIT r918 - box/chris/merge/test/backupdiff

[boxbackup-dev at fluffy.co.uk]

Author: chris
Date: 2006-09-01 09:00:04 +0100 (Fri, 01 Sep 2006)
New Revision: 918

Modified:
   box/chris/merge/test/backupdiff/testbackupdiff.cpp
Log:
(refs #3) 

This test takes a long time on Win32 (slow file access? VMware?), so:

 * Disable verbose debug logging, which makes it even slower
 * Print a warning before the slow test starts
 * Increase timeout


Modified: box/chris/merge/test/backupdiff/testbackupdiff.cpp
===================================================================
--- box/chris/merge/test/backupdiff/testbackupdiff.cpp	2006-09-01 07:57:05 UTC (rev 917)
+++ box/chris/merge/test/backupdiff/testbackupdiff.cpp	2006-09-01 08:00:04 UTC (rev 918)
@@ -369,8 +369,10 @@
 {
 	// Want to trace out all the details
 	#ifndef NDEBUG
+	#ifndef WIN32
 	BackupStoreFile::TraceDetailsOfDiffProcess = true;
 	#endif
+	#endif
 
 	// Create all the test files
 	create_test_files();
@@ -503,8 +505,15 @@
 	// suck up lots of processor time -- because of lots of matches 
 	// found. Check this out!
 
+	#ifdef WIN32
+	::fprintf(stdout, "Testing diffing two large streams, "
+		"may take a while!\n");
+	::fflush(stdout);
+	#endif
+
 	make_file_of_zeros("testfiles/zero.0", 20*1024*1024);
 	make_file_of_zeros("testfiles/zero.1", 200*1024*1024);
+
 	// Generate a first encoded file
 	{
 		BackupStoreFilenameClear f0name("zero.0");
@@ -524,7 +533,14 @@
 			2000 /* object ID of the file diffing from */, blockindex, IOStream::TimeOutInfinite,
 			0, 0));
 		encoded->CopyStreamTo(out);
+
+		printf("Time taken: %d seconds\n", (int)(time(0) - beginTime));
+
+		#ifdef WIN32
+		TEST_THAT(time(0) < (beginTime + 300));
+		#else
 		TEST_THAT(time(0) < (beginTime + 40));
+		#endif
 	}
 	// Remove zero-files to save disk space
 	remove("testfiles/zero.0");