[Box Backup-commit] COMMIT r1572 - box/chris/merge/test/basicserver

boxbackup-dev at fluffy.co.uk boxbackup-dev at fluffy.co.uk
Sun Apr 22 21:02:41 BST 2007


Author: chris
Date: 2007-04-22 21:02:40 +0100 (Sun, 22 Apr 2007)
New Revision: 1572

Modified:
   box/chris/merge/test/basicserver/testbasicserver.cpp
Log:
Use LaunchServer to remove the need for some #ifdefs.

Use directory separator constant instead of forward slash.

Add some blank lines for readability. (refs #3)


Modified: box/chris/merge/test/basicserver/testbasicserver.cpp
===================================================================
--- box/chris/merge/test/basicserver/testbasicserver.cpp	2007-04-22 19:42:37 UTC (rev 1571)
+++ box/chris/merge/test/basicserver/testbasicserver.cpp	2007-04-22 20:02:40 UTC (rev 1572)
@@ -436,13 +436,8 @@
 
 	// Launch a basic server
 	{
-		#ifdef WIN32
-			int pid = LaunchServer("test srv1 testfiles\\srv1.conf", 
-				"testfiles\\srv1.pid");
-		#else
-			int pid = LaunchServer("./test srv1 testfiles/srv1.conf", 
-				"testfiles/srv1.pid");
-		#endif
+		int pid = LaunchServer("./test srv1 testfiles/srv1.conf", 
+			"testfiles/srv1.pid");
 
 		TEST_THAT(pid != -1 && pid != 0);
 		if(pid > 0)
@@ -454,9 +449,10 @@
 
 			// Move the config file over
 			#ifdef WIN32
-				TEST_THAT(::unlink("testfiles/srv1.conf") 
-					!= -1);
+				TEST_THAT(::unlink("testfiles"
+					DIRECTORY_SEPARATOR "srv1.conf") != -1);
 			#endif
+
 			TEST_THAT(::rename(
 				"testfiles" DIRECTORY_SEPARATOR "srv1b.conf", 
 				"testfiles" DIRECTORY_SEPARATOR "srv1.conf") 
@@ -474,6 +470,7 @@
 
 			// Kill it off
 			TEST_THAT(KillServer(pid));
+
 			#ifndef WIN32
 				TestRemoteProcessMemLeaks(
 					"generic-daemon.memleaks");
@@ -483,15 +480,11 @@
 	
 	// Launch a test forking server
 	{
-		#ifdef WIN32
-			int pid = LaunchServer("test srv2 testfiles\\srv2.conf", 
-				"testfiles\\srv2.pid");
-		#else
-			int pid = LaunchServer("./test srv2 testfiles/srv2.conf", 
-				"testfiles/srv2.pid");
-		#endif
+		int pid = LaunchServer("./test srv2 testfiles/srv2.conf", 
+			"testfiles/srv2.pid");
 
 		TEST_THAT(pid != -1 && pid != 0);
+
 		if(pid > 0)
 		{
 			// Will it restart?
@@ -530,6 +523,7 @@
 					conns.push_back(&conn2);
 					conns.push_back(&conn3);
 				#endif // !WIN32
+
 				Srv2TestConversations(conns);
 				// Implicit close
 			}
@@ -554,15 +548,11 @@
 
 	// Launch a test SSL server
 	{
-		#ifdef WIN32
-			int pid = LaunchServer("test srv3 testfiles\\srv3.conf", 
-				"testfiles\\srv3.pid");
-		#else
-			int pid = LaunchServer("./test srv3 testfiles/srv3.conf",
-				"testfiles/srv3.pid");
-		#endif
+		int pid = LaunchServer("./test srv3 testfiles/srv3.conf",
+			"testfiles/srv3.pid");
 
 		TEST_THAT(pid != -1 && pid != 0);
+
 		if(pid > 0)
 		{
 			// Will it restart?
@@ -598,9 +588,9 @@
 				#endif
 
 				// Quick check that reconnections fail
-				TEST_CHECK_THROWS(conn1.Open(context, 
-					Socket::TypeUNIX, 
-					"testfiles/srv3.sock"),
+				TEST_CHECK_THROWS(conn1.Open(context,
+					Socket::TypeUNIX,
+					"testfiles/srv3.sock");,
 					ServerException, SocketAlreadyOpen);
 
 				// Stuff some data around
@@ -637,15 +627,11 @@
 //protocolserver:
 	// Launch a test protocol handling server
 	{
-		#ifdef WIN32
-			int pid = LaunchServer("test srv4 testfiles\\srv4.conf", 
-				"testfiles\\srv4.pid");
-		#else
-			int pid = LaunchServer("./test srv4 testfiles/srv4.conf", 
-				"testfiles/srv4.pid");
-		#endif
+		int pid = LaunchServer("./test srv4 testfiles/srv4.conf", 
+			"testfiles/srv4.pid");
 
 		TEST_THAT(pid != -1 && pid != 0);
+
 		if(pid > 0)
 		{
 			::sleep(1);
@@ -656,8 +642,7 @@
 			#ifdef WIN32
 				conn.Open(Socket::TypeINET, "localhost", 2003);
 			#else
-				conn.Open(Socket::TypeUNIX, 
-					"testfiles/srv4.sock");
+				conn.Open(Socket::TypeUNIX, "testfiles/srv4.sock");
 			#endif
 			
 			// Create a protocol




More information about the Boxbackup-commit mailing list