X-Git-Url: http://developer.intra2net.com/git/?p=libt2n;a=blobdiff_plain;f=test%2Fcmdgroup.cpp;h=eee54bf72e74856a342dcd001c737999c13203cb;hp=fc5952b92ab58440eef570b4ce2426df17aee909;hb=0995cebb9189b872e8d7e58d8b8122fa00cc9061;hpb=539b09c0c1819f9394e5a0ae8b3df3687715fa7c

diff --git a/test/cmdgroup.cpp b/test/cmdgroup.cpp
index fc5952b..eee54bf 100644
--- a/test/cmdgroup.cpp
+++ b/test/cmdgroup.cpp
@@ -167,19 +167,23 @@ class test_cmdgroup : 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 GroupOk()
     {
-        pid_t pid;
-
-        switch(pid=fork())
+        switch(child_pid=fork())
         {
             case -1:
             {
@@ -189,12 +193,18 @@ class test_cmdgroup : public TestFixture
             case 0:
             // child
             {
-                socket_server ss("./socket");
-                group_command_server<cmd_group_a> cs(ss);
+                try
+                {
+                    socket_server ss("./socket");
+                    group_command_server<cmd_group_a> cs(ss);
 
-                // max 10 sec
-                for (int i=0; i < 10; i++)
-                    cs.handle(1000000);
+                    // max 10 sec
+                    for (int i=0; i < 10; i++)
+                        cs.handle(1000000);
+                } catch(...)
+                {
+                    std::cerr << "exception in child. ignoring\n";
+                }
 
                 // don't call atexit and stuff
                 _exit(0);
@@ -206,7 +216,7 @@ class test_cmdgroup : 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 testfunc4a_cmd("hello"),rc);
@@ -220,9 +230,7 @@ class test_cmdgroup : public TestFixture
 
     void WrongGroup()
     {
-        pid_t pid;
-
-        switch(pid=fork())
+        switch(child_pid=fork())
         {
             case -1:
             {
@@ -232,12 +240,18 @@ class test_cmdgroup : public TestFixture
             case 0:
             // child
             {
-                socket_server ss("./socket");
-                group_command_server<cmd_group_b> cs(ss);
+                try
+                {
+                    socket_server ss("./socket");
+                    group_command_server<cmd_group_b> cs(ss);
 
-                // max 10 sec
-                for (int i=0; i < 10; i++)
-                    cs.handle(1000000);
+                    // max 10 sec
+                    for (int i=0; i < 10; i++)
+                        cs.handle(1000000);
+                } catch(...)
+                {
+                    std::cerr << "exception in child. ignoring\n";
+                }
 
                 // don't call atexit and stuff
                 _exit(0);
@@ -249,7 +263,7 @@ class test_cmdgroup : 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 testfunc4a_cmd("hello"),rc);