[Python-checkins] r51249 - sandbox/trunk/pdb/test/support.py sandbox/trunk/pdb/test/test_mpdb.py

[matt.fleming]

Author: matt.fleming
Date: Sun Aug 13 20:11:23 2006
New Revision: 51249

Modified:
   sandbox/trunk/pdb/test/support.py
   sandbox/trunk/pdb/test/test_mpdb.py
Log:
Fixed one test file.


Modified: sandbox/trunk/pdb/test/support.py
==============================================================================
--- sandbox/trunk/pdb/test/support.py	(original)
+++ sandbox/trunk/pdb/test/support.py	Sun Aug 13 20:11:23 2006
@@ -52,7 +52,8 @@
         self.lines = []
 
         if not addr:
-            self.addr = 'tcp localhost:8000'
+            addr = 'tcp localhost:8000'
+        self.addr = addr
 
     def msg_nocr(self, msg, out=None):
         self.lines.append(msg)

Modified: sandbox/trunk/pdb/test/test_mpdb.py
==============================================================================
--- sandbox/trunk/pdb/test/test_mpdb.py	(original)
+++ sandbox/trunk/pdb/test/test_mpdb.py	Sun Aug 13 20:11:23 2006
@@ -19,7 +19,7 @@
 from mpdb import MPdb, pdbserver, target
 from mconnection import (MConnectionClientTCP, MConnectionServerTCP,
                          ConnectionFailed)
-from support import MPdbTest, Pdbserver
+from support import MPdbTest, Pdbserver, MPdbTestThread
 TESTFN = 'tester'
 
 # This provides us with a fine-grain way of connecting to a server
@@ -51,28 +51,37 @@
 # and vice versa.
 
     def testPdbserver(self):
-        client = MPdbTest()
-        thread.start_new_thread(connect_to_target, (client,))
+        client = MPdbTest(MPdb())
+        client.do_target('tcp localhost:8000')
         
-        self.server1 = MPdbTest()
-        self.server1.do_pdbserver('tcp '+__addr__)
+        self.server1 = Pdbserver(MPdb())
+        self.server1.start()
 
-        self.server1.connection.disconnect()
-
-        self.server2 = MPdbTest()
-        self.server2.do_pdbserver('unknown_protocol unknownhost')
+        while self.server1.connection is None:
+            time.sleep(0.1)
+        #self.server1.connection.disconnect()
+        self.server1.onecmd('quit\n')
+
+        self.server2 = Pdbserver(MPdb(), 'unknown_protocol unknownhost')
+        self.server2.start()
+        time.sleep(1.0)
         line = self.server2.lines[0]
         self.assertEquals('*** Unknown protocol\n', line)
 
+        client.onecmd('quit\n')
+        self.server2.onecmd('quit\n')
+
     def testTarget(self):
-        server = MConnectionServerTCP()
-        thread.start_new_thread(server.connect, (__addr__,True))
+        server = Pdbserver(MPdb())
+        server.start()
+        while server.connection is None:
+            time.sleep(0.1)
 
-        self.client1 = MPdbTest()
-        connect_to_target(self.client1)
+        self.client1 = MPdbTest(MPdb())
 
-        self.client2 = MPdbTest()
+        self.client2 = MPdbTest(MPdb())
         self.client2.do_target('dlkdlksldkslkd')
+
         line = self.client2.lines[0]
         self.assertEquals('*** Invalid arguments\n', line)
 
@@ -92,10 +101,10 @@
 
         self.assertEquals(errmsg, line)
 
-        server.disconnect()
+        server.connection.disconnect()
 
         for i in range(MAXTRIES):
-            if server._sock != None: pass
+            if server.connection != None: pass
             else: break
 
     def testRebindOutput(self):
@@ -125,20 +134,21 @@
         self.assertEquals(line, 'help', 'Could not rebind input.')
 
     def testRestart(self):
-        server = Pdbserver()
+        server = Pdbserver(MPdb())
         server.start()
 
-        self.client1 = MPdbTest()
+        self.client1 = MPdbTest(MPdb())
         self.client1.do_target('tcp localhost:8000')
 
         while 'Failed' in self.client1.lines[0]:
+            time.sleep(1.0)
             self.client1.lines = []
             self.client1.do_target('tcp localhost:8000')
 
-        server.target = 'remote'
-        self.client1.onecmd('restart')
+        # The server will _NOT_ come back up so don't try to reconnect
+        server.onecmd('restart\n')
         self.client1.connection.write('rquit\n')
-        server.disconnect()
+        server.connection.disconnect()
 
         for i in range(MAXTRIES):
             if server.connection != None: pass
@@ -150,7 +160,7 @@
     output to ensure that documentation constantly stays the same.
     """
     def setUp(self):
-        self.m = MPdbTest()
+        self.m = MPdbTest(MPdb())
 
     def tearDown(self):
         del self.m