Reconstructed release dates in ChangeLog

[libt2n] / test / callback.cpp

diff --git a/test/callback.cpp b/test/callback.cpp
index bc951b9..60c9058 100644 (file)
--- a/test/callback.cpp
+++ b/test/callback.cpp
@@ -44,6 +44,8 @@ class test_callback : public TestFixture
 
     std::vector<bool> callback_done;
 
+    pid_t child_pid;
+
     public:
 
     void setUp()
@@ -54,6 +56,10 @@ class test_callback : public TestFixture
     void tearDown()
     {
         callback_done.clear();
+
+        // make sure the server-child is dead before the next test runs
+        kill(child_pid,SIGKILL);
+        sleep(1);
     }
 
     void callback_func(callback_event_type ev, int conn_id)
@@ -67,9 +73,7 @@ class test_callback : public TestFixture
 
     void ServerNewConnCallback()
     {
-        pid_t pid;
-
-        switch(pid=fork())
+        switch(child_pid=fork())
         {
             case -1:
             {
@@ -79,20 +83,26 @@ class test_callback : public TestFixture
             case 0:
             // child
             {
-                string data;
-                // wait till server is up
-                sleep(1);
-
+                try
                 {
-                    socket_client_connection sc("./socket");
+                    string data;
+                    // wait till server is up
+                    sleep(1);
 
-                    sc.write("ABC");
+                    {
+                        socket_client_connection sc("./socket");
 
-                    // wait half a sec
-                    sc.fill_buffer(500000);
-                    sc.get_packet(data);
+                        sc.write("ABC");
+
+                        // wait half a sec
+                        sc.fill_buffer(500000);
+                        sc.get_packet(data);
 
-                    // close the connection
+                        // close the connection
+                    }
+                } catch(...)
+                {
+                    std::cerr << "exception in child. ignoring\n";
                 }
 
                 // don't call atexit and stuff
@@ -128,9 +138,7 @@ class test_callback : public TestFixture
 
     void ServerConnClosedCallback()
     {
-        pid_t pid;
-
-        switch(pid=fork())
+        switch(child_pid=fork())
         {
             case -1:
             {
@@ -140,20 +148,26 @@ class test_callback : public TestFixture
             case 0:
             // child
             {
-                string data;
-                // wait till server is up
-                sleep(1);
-
+                try
                 {
-                    socket_client_connection sc("./socket");
+                    string data;
+                    // wait till server is up
+                    sleep(1);
 
-                    sc.write("ABC");
+                    {
+                        socket_client_connection sc("./socket");
 
-                    // wait half a sec
-                    sc.fill_buffer(500000);
-                    sc.get_packet(data);
+                        sc.write("ABC");
 
-                    // close the connection
+                        // wait half a sec
+                        sc.fill_buffer(500000);
+                        sc.get_packet(data);
+
+                        // close the connection
+                    }
+                } catch(...)
+                {
+                    std::cerr << "exception in child. ignoring\n";
                 }
 
                 // don't call atexit and stuff
@@ -189,9 +203,7 @@ class test_callback : public TestFixture
 
     void ServerConnDeletedCallback()
     {
-        pid_t pid;
-
-        switch(pid=fork())
+        switch(child_pid=fork())
         {
             case -1:
             {
@@ -201,20 +213,26 @@ class test_callback : public TestFixture
             case 0:
             // child
             {
-                string data;
-                // wait till server is up
-                sleep(1);
-
+                try
                 {
-                    socket_client_connection sc("./socket");
+                    string data;
+                    // wait till server is up
+                    sleep(1);
 
-                    sc.write("ABC");
+                    {
+                        socket_client_connection sc("./socket");
 
-                    // wait half a sec
-                    sc.fill_buffer(500000);
-                    sc.get_packet(data);
+                        sc.write("ABC");
+
+                        // wait half a sec
+                        sc.fill_buffer(500000);
+                        sc.get_packet(data);
 
-                    // close the connection
+                        // close the connection
+                    }
+                } catch(...)
+                {
+                    std::cerr << "exception in child. ignoring\n";
                 }
 
                 // don't call atexit and stuff
@@ -253,9 +271,7 @@ class test_callback : public TestFixture
 
     void ServerCallbackOrder()
     {
-        pid_t pid;
-
-        switch(pid=fork())
+        switch(child_pid=fork())
         {
             case -1:
             {
@@ -265,22 +281,28 @@ class test_callback : public TestFixture
             case 0:
             // child
             {
-                string data;
-                // wait till server is up
-                sleep(1);
-
+                try
                 {
-                    socket_client_connection sc("./socket");
+                    string data;
+                    // wait till server is up
+                    sleep(1);
 
-                    sc.write("1");
+                    {
+                        socket_client_connection sc("./socket");
 
-                    // wait half a sec
-                    sc.fill_buffer(500000);
-                    sc.get_packet(data);
+                        sc.write("1");
+
+                        // wait half a sec
+                        sc.fill_buffer(500000);
+                        sc.get_packet(data);
 
-                    sc.write("2");
+                        sc.write("2");
 
-                    // close the connection
+                        // close the connection
+                    }
+                } catch(...)
+                {
+                    std::cerr << "exception in child. ignoring\n";
                 }
 
                 // don't call atexit and stuff
@@ -336,9 +358,7 @@ class test_callback : public TestFixture
 
     void ClientConnClosedCallback()
     {
-        pid_t pid;
-
-        switch(pid=fork())
+        switch(child_pid=fork())
         {
             case -1:
             {
@@ -348,18 +368,25 @@ class test_callback : public TestFixture
             case 0:
             // child
             {
-                socket_server ss("./socket");
-
-                // max 3 sec
-                for (int i=0; i < 3; i++)
+                try
                 {
-                    ss.fill_buffer(1000000);
+                    socket_server ss("./socket");
 
-                    string data;
-                    unsigned int cid;
-                    if(ss.get_packet(data,cid))
-                        break;
+                    // max 3 sec
+                    for (int i=0; i < 3; i++)
+                    {
+                        ss.fill_buffer(1000000);
+
+                        string data;
+                        unsigned int cid;
+                        if(ss.get_packet(data,cid))
+                            break;
+                    }
+                } catch(...)
+                {
+                    std::cerr << "exception in child. ignoring\n";
                 }
+
                 // don't call atexit and stuff
                 _exit(0);
             }
@@ -390,9 +417,7 @@ class test_callback : public TestFixture
 
     void ClientConnDeletedCallback()
     {
-        pid_t pid;
-
-        switch(pid=fork())
+        switch(child_pid=fork())
         {
             case -1:
             {
@@ -402,18 +427,25 @@ class test_callback : public TestFixture
             case 0:
             // child
             {
-                socket_server ss("./socket");
-
-                // max 3 sec
-                for (int i=0; i < 3; i++)
+                try
                 {
-                    ss.fill_buffer(1000000);
+                    socket_server ss("./socket");
 
-                    string data;
-                    unsigned int cid;
-                    if(ss.get_packet(data,cid))
-                        break;
+                    // max 3 sec
+                    for (int i=0; i < 3; i++)
+                    {
+                        ss.fill_buffer(1000000);
+
+                        string data;
+                        unsigned int cid;
+                        if(ss.get_packet(data,cid))
+                            break;
+                    }
+                } catch(...)
+                {
+                    std::cerr << "exception in child. ignoring\n";
                 }
+
                 // don't call atexit and stuff
                 _exit(0);
             }