[Box Backup-commit] COMMIT r2513 - box/trunk/test/httpserver

[boxbackup-dev at boxbackup.org]

Author: chris
Date: 2009-04-26 19:41:41 +0100 (Sun, 26 Apr 2009)
New Revision: 2513

Modified:
   box/trunk/test/httpserver/testhttpserver.cpp
Log:
Fix httpserver tests on win32.


Modified: box/trunk/test/httpserver/testhttpserver.cpp
===================================================================
--- box/trunk/test/httpserver/testhttpserver.cpp	2009-04-26 14:41:24 UTC (rev 2512)
+++ box/trunk/test/httpserver/testhttpserver.cpp	2009-04-26 18:41:41 UTC (rev 2513)
@@ -238,8 +238,13 @@
 	
 	// Kill it
 	TEST_THAT(KillServer(pid));
-	TestRemoteProcessMemLeaks("generic-httpserver.memleaks");
 
+	#ifdef WIN32
+		TEST_THAT(unlink("testfiles/httpserver.pid") == 0);
+	#else
+		TestRemoteProcessMemLeaks("generic-httpserver.memleaks");
+	#endif
+
 	// correct, official signature should succeed, with lower-case header
 	{
 		// http://docs.amazonwebservices.com/AmazonS3/2006-03-01/RESTAuthentication.html
@@ -387,6 +392,7 @@
 		TEST_EQUAL(404, response.GetResponseCode());
 	}
 
+	#ifndef WIN32 // much harder to make files inaccessible on WIN32
 	// Make file inaccessible, should cause server to return a 403 error,
 	// unless of course the test is run as root :)
 	{
@@ -405,6 +411,7 @@
 		TEST_EQUAL(403, response.GetResponseCode());
 		TEST_THAT(chmod("testfiles/testrequests.pl", 0755) == 0);
 	}
+	#endif
 
 	{
 		HTTPRequest request(HTTPRequest::Method_GET,
@@ -461,8 +468,13 @@
 
 	// Kill it
 	TEST_THAT(KillServer(pid));
-	TestRemoteProcessMemLeaks("generic-httpserver.memleaks");
 
+	#ifdef WIN32
+		TEST_THAT(unlink("testfiles/s3simulator.pid") == 0);
+	#else
+		TestRemoteProcessMemLeaks("generic-httpserver.memleaks");
+	#endif
+
 	return 0;
 }