X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=test%2Futil%2Fserver.py;h=a70e4499f9b49cb0ab99ef13e97e09f66272b127;hb=466124a0e768a46cb652595e49fb2d06a7d32c0c;hp=da2694d057b453db769ab01bccb44a286aa4b843;hpb=be8e950f78c5ad6e2db889f5f48fdefe9aec03fc;p=nepi.git

diff --git a/test/util/server.py b/test/util/server.py
index da2694d0..a70e4499 100755
--- a/test/util/server.py
+++ b/test/util/server.py
@@ -25,6 +25,28 @@ class ServerTestCase(unittest.TestCase):
         reply = c.read_reply()
         self.assertTrue(reply == "Stopping server")
 
+    def test_server_reconnect(self):
+        s = server.Server(self.root_dir)
+        s.run()
+        c = server.Client(self.root_dir)
+        
+        c.send_msg("Hola")
+        reply = c.read_reply()
+        self.assertTrue(reply == "Reply to: Hola")
+        
+        # disconnect
+        del c
+        
+        # reconnect
+        c = server.Client(self.root_dir)
+        c.send_msg("Hola")
+        reply = c.read_reply()
+        self.assertTrue(reply == "Reply to: Hola")
+                
+        c.send_stop()
+        reply = c.read_reply()
+        self.assertTrue(reply == "Stopping server")
+
     def test_server_long_message(self):
         s = server.Server(self.root_dir)
         s.run()
@@ -54,6 +76,37 @@ class ServerTestCase(unittest.TestCase):
         reply = c.read_reply()
         self.assertTrue(reply == "Stopping server")
 
+    def test_ssh_server_reconnect(self):
+        env = test_util.test_environment()
+        user = getpass.getuser()
+        # launch server
+        python_code = "from nepi.util import server;s=server.Server('%s');\
+                s.run()" % self.root_dir
+        server.popen_ssh_subprocess(python_code, host = "localhost", 
+                port = env.port, user = user, agent = True)
+        
+        c = server.Client(self.root_dir, host = "localhost", port = env.port,
+                user = user, agent = True)
+                
+        c.send_msg("Hola")
+        reply = c.read_reply()
+        self.assertTrue(reply == "Reply to: Hola")
+        
+        # disconnect
+        del c
+        
+        # reconnect
+        c = server.Client(self.root_dir, host = "localhost", port = env.port,
+                user = user, agent = True)
+                
+        c.send_msg("Hola")
+        reply = c.read_reply()
+        self.assertTrue(reply == "Reply to: Hola")
+        
+        c.send_stop()
+        reply = c.read_reply()
+        self.assertTrue(reply == "Stopping server")
+
     def tearDown(self):
         shutil.rmtree(self.root_dir)