X-Git-Url: http://developer.intra2net.com/git/?p=libt2n;a=blobdiff_plain;f=test%2Fsimplecmd.cpp;h=36e08f1929d314c7da52d72692fb12538e7aa7ce;hp=eb4343c5a9fd3ff9a9131943441733ef02a505a4;hb=e72e07f3178ced4277066c5df4dfd5934fac49e8;hpb=58b327c6c65474fdfde7d0d99d66d3986400f208

diff --git a/test/simplecmd.cpp b/test/simplecmd.cpp
index eb4343c..36e08f1 100644
--- a/test/simplecmd.cpp
+++ b/test/simplecmd.cpp
@@ -121,20 +121,23 @@ class test_simplecmd : public TestFixture
 
     CPPUNIT_TEST_SUITE_END();
 
+    pid_t child_pid;
+
     public:
 
     void setUp()
-    {
-}
+    { }
 
     void tearDown()
-    { }
+    {
+        // make sure the server-child is dead before the next test runs
+        kill(child_pid,SIGKILL);
+        sleep(1);
+    }
 
     void SimpleCmd()
     {
-        pid_t pid;
-
-        switch(pid=fork())
+        switch(child_pid=fork())
         {
             case -1:
             {
@@ -162,7 +165,7 @@ class test_simplecmd : public TestFixture
                 sleep(1);
                 socket_client_connection sc("./socket");
                 sc.set_logging(&cerr,debug);
-                command_client cc(sc);
+                command_client cc(&sc);
 
                 result_container rc;
                 cc.send_command(new testfunc_cmd("hello"),rc);
@@ -176,9 +179,7 @@ class test_simplecmd : public TestFixture
 
     void SimpleException()
     {
-        pid_t pid;
-
-        switch(pid=fork())
+        switch(child_pid=fork())
         {
             case -1:
             {
@@ -206,7 +207,7 @@ class test_simplecmd : public TestFixture
                 sleep(1);
                 socket_client_connection sc("./socket");
                 sc.set_logging(&cerr,debug);
-                command_client cc(sc);
+                command_client cc(&sc);
 
                 result_container rc;
                 cc.send_command(new testfunc_cmd("throw"),rc);
@@ -229,9 +230,7 @@ class test_simplecmd : public TestFixture
 
     void BigReturn()
     {
-        pid_t pid;
-
-        switch(pid=fork())
+        switch(child_pid=fork())
         {
             case -1:
             {
@@ -258,7 +257,7 @@ class test_simplecmd : public TestFixture
                 // wait till server is up
                 sleep(1);
                 socket_client_connection sc("./socket");
-                command_client cc(sc);
+                command_client cc(&sc);
 
                 result_container rc;
                 cc.send_command(new testfunc_cmd("big"),rc);
@@ -272,9 +271,7 @@ class test_simplecmd : public TestFixture
 
     void BigParameter()
     {
-        pid_t pid;
-
-        switch(pid=fork())
+        switch(child_pid=fork())
         {
             case -1:
             {
@@ -301,7 +298,7 @@ class test_simplecmd : public TestFixture
                 // wait till server is up
                 sleep(1);
                 socket_client_connection sc("./socket");
-                command_client cc(sc);
+                command_client cc(&sc);
 
                 result_container rc;
                 cc.send_command(new testfunc_cmd(string().insert(0,100*1024,'y')),rc);