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

subversion at boxbackup.org subversion at boxbackup.org
Thu Aug 6 22:25:31 BST 2015


Author: chris
Date: 2015-08-06 21:25:31 +0000 (Thu, 06 Aug 2015)
New Revision: 3618

Modified:
   box/trunk/test/httpserver/testhttpserver.cpp
Log:
Really fix check for s3simulator memleaks.

Modified: box/trunk/test/httpserver/testhttpserver.cpp
===================================================================
--- box/trunk/test/httpserver/testhttpserver.cpp	2015-08-06 21:20:55 UTC (rev 3617)
+++ box/trunk/test/httpserver/testhttpserver.cpp	2015-08-06 21:25:31 UTC (rev 3618)
@@ -143,6 +143,8 @@
 		S3Simulator server;
 		return server.Main("doesnotexist", argc - 1, argv + 1);
 	}
+
+	TEST_THAT(system("rm -rf *.memleaks") == 0);
 	
 	// Start the server
 	int pid = LaunchServer("./_test server testfiles/httpserver.conf", "testfiles/httpserver.pid");
@@ -244,7 +246,7 @@
 	#ifdef WIN32
 		TEST_THAT(unlink("testfiles/httpserver.pid") == 0);
 	#else
-		TestRemoteProcessMemLeaks("s3simulator.memleaks");
+		TestRemoteProcessMemLeaks("generic-httpserver.memleaks");
 	#endif
 
 	// correct, official signature should succeed, with lower-case header
@@ -472,7 +474,7 @@
 	#ifdef WIN32
 		TEST_THAT(unlink("testfiles/s3simulator.pid") == 0);
 	#else
-		TestRemoteProcessMemLeaks("generic-httpserver.memleaks");
+		TestRemoteProcessMemLeaks("s3simulator.memleaks");
 	#endif
 
 	return 0;




More information about the Boxbackup-commit mailing list