libt2n: (tomj) fix mysterious crashes in test::ReentrantServer: boost serialization...

[libt2n] / test / wrapper.cpp

diff --git a/test/wrapper.cpp b/test/wrapper.cpp
index c820531..17fb0ef 100644 (file)
--- a/test/wrapper.cpp
+++ b/test/wrapper.cpp
@@ -236,10 +236,6 @@ class test_wrapper : public TestFixture
     CPPUNIT_TEST(ignore_server_disconnect);
     CPPUNIT_TEST(ignore_handler_reconnects);
 
-//  TODO: missing tests:
-//  ignore: init, no server, ignore
-//  ignore: init, no server, ignore, server ok, connect?
-
     CPPUNIT_TEST_SUITE_END();
 
     public:
@@ -261,18 +257,24 @@ class test_wrapper : public TestFixture
             case 0:
             // child
             {
-                int i=0;
-                while(i < 10 && !kill_server)
+                try
                 {
-                    close_server=false;
-
-                    socket_server ss("./socket");
-                    group_command_server<cmd_group_x> cs(ss);
-                    ss.set_logging(&logstream,debug);
-
-                    // max 10 sec
-                    for (; !close_server && !kill_server && i < 10; i++)
-                        cs.handle(1000000);
+                    int i=0;
+                    while(i < 10 && !kill_server)
+                    {
+                        close_server=false;
+
+                        socket_server ss("./socket");
+                        group_command_server<cmd_group_x> cs(ss);
+                        ss.set_logging(&logstream,debug);
+
+                        // max 10 sec
+                        for (; !close_server && !kill_server && i < 10; i++)
+                            cs.handle(1000000);
+                    }
+                } catch(...)
+                {
+                    std::cerr << "exception in child. ignoring\n";
                 }
 
                 // don't call atexit and stuff
@@ -421,8 +423,6 @@ class test_wrapper : public TestFixture
         CPPUNIT_ASSERT_EQUAL(2,cnt);
     }
 
-
-
 };
 
 CPPUNIT_TEST_SUITE_REGISTRATION(test_wrapper);
@@ -434,6 +434,7 @@ class test_wrapper_noserver : public TestFixture
 
     CPPUNIT_TEST(ignore_noserver);
     CPPUNIT_TEST(ignore_finds_lateserver);
+    CPPUNIT_TEST(ignore_wrongserver);
 
     CPPUNIT_TEST_SUITE_END();
 
@@ -442,10 +443,19 @@ class test_wrapper_noserver : public TestFixture
     pid_t child_pid;
 
     void setUp()
-    {  }
+    {
+        child_pid=0;
+    }
 
     void tearDown()
-    {  }
+    {
+        // make sure the server-child is dead before the next test runs
+        if (child_pid != 0)
+        {
+            kill(child_pid,SIGKILL);
+            sleep(1);
+        }
+    }
 
     void ignore_noserver()
     {
@@ -472,7 +482,6 @@ class test_wrapper_noserver : public TestFixture
         t2n_exec(&cmd_group_x_client::serverfunc)(1);
 
         // launch a server
-
         close_server=false;
         kill_server=false;
 
@@ -486,18 +495,84 @@ class test_wrapper_noserver : public TestFixture
             case 0:
             // child
             {
-                int i=0;
-                while(i < 10 && !kill_server)
+                try
+                {
+                    int i=0;
+                    while(i < 10 && !kill_server)
+                    {
+                        close_server=false;
+
+                        socket_server ss("./socket");
+                        group_command_server<cmd_group_x> cs(ss);
+                        ss.set_logging(&logstream,debug);
+
+                        // max 10 sec
+                        for (; !close_server && !kill_server && i < 10; i++)
+                            cs.handle(1000000);
+                    }
+                } catch(...)
                 {
-                    close_server=false;
+                    std::cerr << "exception in child. ignoring\n";
+                }
+
+                // don't call atexit and stuff
+                _exit(0);
+            }
+
+            default:
+            // parent
+            {
+                // wait till server is up
+                sleep(1);
+            }
+        }
+
+        // server should be active
+        int i=t2n_exec(&cmd_group_x_client::serverfunc)(1);
+
+        CPPUNIT_ASSERT_EQUAL(2,i);
+    }
+
+    void send_hello(string hello_string, socket_server* ss, int conn_id)
+    {
+        server_connection *sc=ss->get_connection(conn_id);
+        sc->write(hello_string);
+    }
+
+    void ignore_wrongserver()
+    {
+        wraptype::set_connection(auto_ptr<ConnectionWrapper>
+            (new ReconnectIgnoreFailureSocketWrapper("./socket")));
 
+        // launch a server
+
+        switch(child_pid=fork())
+        {
+            case -1:
+            {
+                CPPUNIT_FAIL("fork error");
+                break;
+            }
+            case 0:
+            // child
+            {
+                try
+                {
                     socket_server ss("./socket");
-                    group_command_server<cmd_group_x> cs(ss);
-                    ss.set_logging(&logstream,debug);
+
+                    // server sends garbage
+
+                    ostringstream hello;
+                    hello << "XYZ 123";
+
+                    ss.add_callback(new_connection,bind(&test_wrapper_noserver::send_hello, boost::ref(*this), hello.str(),&ss, _1));
 
                     // max 10 sec
-                    for (; !close_server && !kill_server && i < 10; i++)
-                        cs.handle(1000000);
+                    for (int i=0; i < 10; i++)
+                        ss.fill_buffer(1000000);
+                } catch(...)
+                {
+                    std::cerr << "exception in child. ignoring\n";
                 }
 
                 // don't call atexit and stuff
@@ -512,14 +587,13 @@ class test_wrapper_noserver : public TestFixture
             }
         }
 
-        // server should be active
+        // there is no valid server
+
         int i=t2n_exec(&cmd_group_x_client::serverfunc)(1);
 
-        CPPUNIT_ASSERT_EQUAL(2,i);
+        // result is constructed with default constructor on error-and-ignore  -> i=0
 
-        // make sure the server-child is dead before the next test runs
-        kill(child_pid,SIGKILL);
-        sleep(1);
+        CPPUNIT_ASSERT_EQUAL(0,i);
     }