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

[boxbackup-dev@fluffy.co.uk]

Author: chris
Date: 2007-04-21 12:12:37 +0100 (Sat, 21 Apr 2007)
New Revision: 1531

Modified:
   box/chris/merge/test/bbackupd/testbbackupd.cpp
Log:
Comment out some tests that don't work on Win32 (refs #3)


Modified: box/chris/merge/test/bbackupd/testbbackupd.cpp
===================================================================
--- box/chris/merge/test/bbackupd/testbbackupd.cpp	2007-04-21 11:10:16 UTC (rev 1530)
+++ box/chris/merge/test/bbackupd/testbbackupd.cpp	2007-04-21 11:12:37 UTC (rev 1531)
@@ -438,7 +438,11 @@
 	TEST_THAT(KillServer(bbstored_pid));
 	::sleep(1);
 	TEST_THAT(!ServerIsAlive(bbstored_pid));
-	TestRemoteProcessMemLeaks("bbstored.memleaks");
+
+	#ifndef WIN32
+		TestRemoteProcessMemLeaks("bbstored.memleaks");
+	#endif
+	
 	return 0;
 }
 
@@ -1204,6 +1208,10 @@
 			"\"compare -ac\" quit");
 		TEST_RETURN(compareReturnValue, 1);
 		TestRemoteProcessMemLeaks("bbackupquery.memleaks");
+		#ifdef WIN32
+			TEST_THAT(::unlink("testfiles/TestDir1/untracked-2") 
+				== 0);
+		#endif
 		TEST_THAT(::rename("testfiles/TestDir1/untracked-1", 
 			"testfiles/TestDir1/untracked-2") == 0);
 		TEST_THAT(!TestFileExists("testfiles/TestDir1/untracked-1"));
@@ -1243,6 +1251,9 @@
 			"\"compare -ac\" quit");
 		TEST_RETURN(compareReturnValue, 1);
 		TestRemoteProcessMemLeaks("bbackupquery.memleaks");
+		#ifdef WIN32
+			TEST_THAT(::unlink("testfiles/TestDir1/tracked-2") == 0);
+		#endif
 		TEST_THAT(::rename("testfiles/TestDir1/tracked-1", 
 			"testfiles/TestDir1/tracked-2") == 0);
 		TEST_THAT(!TestFileExists("testfiles/TestDir1/tracked-1"));
@@ -1345,6 +1356,7 @@
 		TEST_RETURN(compareReturnValue, 2);
 		TestRemoteProcessMemLeaks("bbackupquery.memleaks");
 
+#ifndef WIN32
 		// These tests only work as non-root users.
 		if(::getuid() != 0)
 		{
@@ -1381,6 +1393,7 @@
 			::chmod("testfiles/TestDir1/sub23/read-fail-test-dir", 0770);
 			::chmod("testfiles/TestDir1/read-fail-test-file", 0770);
 		}
+#endif // WIN32
 
 		printf("Continuously update file, check isn't uploaded\n");
 		
@@ -1725,12 +1738,15 @@
 	::system(BBACKUPQUERY " -q -c testfiles/bbackupd.conf "
 		"-l testfiles/queryLIST.log \"list -rotdh\" quit");
 	TestRemoteProcessMemLeaks("bbackupquery.memleaks");
+
+	#ifndef WIN32	
+		if(::getuid() == 0)
+		{
+			::printf("WARNING: This test was run as root. "
+				"Some tests have been omitted.\n");
+		}
+	#endif
 	
-	if(::getuid() == 0)
-	{
-		::printf("WARNING: This test was run as root. Some tests have been omitted.\n");
-	}
-	
 	return 0;
 }