X-Git-Url: http://developer.intra2net.com/git/?p=libt2n;a=blobdiff_plain;f=test%2Fsimplecmd.cpp;h=03071de3e6e237e6ac8ea99eacc1f1cb6254a9e0;hp=eb4343c5a9fd3ff9a9131943441733ef02a505a4;hb=19facd8558fe2e32ce843860b40631ebe03ff3cf;hpb=58b327c6c65474fdfde7d0d99d66d3986400f208 diff --git a/test/simplecmd.cpp b/test/simplecmd.cpp index eb4343c..03071de 100644 --- a/test/simplecmd.cpp +++ b/test/simplecmd.cpp @@ -1,9 +1,24 @@ -/*************************************************************************** - * Copyright (C) 2004 by Intra2net AG * - * info@intra2net.com * - * * - ***************************************************************************/ +/* +Copyright (C) 2004 by Intra2net AG +The software in this package is distributed under the GNU General +Public License version 2 (with a special exception described below). + +A copy of GNU General Public License (GPL) is included in this distribution, +in the file COPYING.GPL. + +As a special exception, if other files instantiate templates or use macros +or inline functions from this file, or you compile this file and link it +with other works to produce a work based on this file, this file +does not by itself cause the resulting work to be covered +by the GNU General Public License. + +However the source code for this file must still be made available +in accordance with section (3) of the GNU General Public License. + +This exception does not invalidate any other reasons why a work based +on this file might be covered by the GNU General Public License. +*/ #include #include #include @@ -121,20 +136,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: { @@ -144,12 +162,18 @@ class test_simplecmd : public TestFixture case 0: // child { - socket_server ss("./socket"); - command_server cs(ss); + try + { + socket_server ss("./socket"); + command_server 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); @@ -162,7 +186,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 +200,7 @@ class test_simplecmd : public TestFixture void SimpleException() { - pid_t pid; - - switch(pid=fork()) + switch(child_pid=fork()) { case -1: { @@ -188,12 +210,18 @@ class test_simplecmd : public TestFixture case 0: // child { - socket_server ss("./socket"); - command_server cs(ss); + try + { + socket_server ss("./socket"); + command_server 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 +234,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 +257,7 @@ class test_simplecmd : public TestFixture void BigReturn() { - pid_t pid; - - switch(pid=fork()) + switch(child_pid=fork()) { case -1: { @@ -241,12 +267,18 @@ class test_simplecmd : public TestFixture case 0: // child { - socket_server ss("./socket"); - command_server cs(ss); + try + { + socket_server ss("./socket"); + command_server 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); @@ -258,7 +290,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 +304,7 @@ class test_simplecmd : public TestFixture void BigParameter() { - pid_t pid; - - switch(pid=fork()) + switch(child_pid=fork()) { case -1: { @@ -284,12 +314,19 @@ class test_simplecmd : public TestFixture case 0: // child { - socket_server ss("./socket"); - command_server cs(ss); + try + { + socket_server ss("./socket"); + command_server cs(ss); - // max 10 sec - for (int i=0; i < 10; i++) - cs.handle(1000000); + // max 60 sec - we need atleast 28 handle calls to transfer the buffer + for (int i=0; i < 60; i++) { + cs.handle(1000000); + } + } catch(...) + { + std::cerr << "exception in child. ignoring\n"; + } // don't call atexit and stuff _exit(0); @@ -301,7 +338,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);