[shpy-commit] r2836 - in shpy/trunk/dist/shpy/net: . test

[arigo@codespeak.net]

Author: arigo
Date: Mon Jan 19 12:58:53 2004
New Revision: 2836

Modified:
   shpy/trunk/dist/shpy/net/startserver.py
   shpy/trunk/dist/shpy/net/test/test_basic.py
Log:
Fixed the test.
Simplified the main loop of startserver.py.


Modified: shpy/trunk/dist/shpy/net/startserver.py
==============================================================================
--- shpy/trunk/dist/shpy/net/startserver.py	(original)
+++ shpy/trunk/dist/shpy/net/startserver.py	Mon Jan 19 12:58:53 2004
@@ -46,20 +46,17 @@
         except:
             import traceback
             print traceback.print_exc()
-            break
 
 def startserver(hostport):
     if isinstance(hostport, str):
         host, port = hostport.split(':')
         hostport = (host, int(port))
     
-    while 1: 
-        sock = getlisteningsocket(hostport)
+    sock = getlisteningsocket(hostport)
+    try:
         execloop(sock)
-        try:
-            sock.close()
-        except:
-            pass
+    finally:
+        sock.close()
 
 if __name__ == '__main__':
     import sys

Modified: shpy/trunk/dist/shpy/net/test/test_basic.py
==============================================================================
--- shpy/trunk/dist/shpy/net/test/test_basic.py	(original)
+++ shpy/trunk/dist/shpy/net/test/test_basic.py	Mon Jan 19 12:58:53 2004
@@ -2,7 +2,7 @@
 
 from unittest2 import check, main
 from unittest2.tool import dyncode
-from shpy.net.register import register
+from shpy.net.register import ServerGateway
 from shpy.net.test import functest
 
 # testing host and port 
@@ -22,7 +22,7 @@
     proc = popen2.Popen4('python %s %s' % (pyfile, hostport))
     atexit.register(os.kill, proc.pid, 15)
     time.sleep(1.0)
-    gw = register(hostport)
+    gw = ServerGateway(hostport)
     atexit.register(setattr, gw, 'running', 0)
     started.append(gw)
     return gw