summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael W. Hudson <mwh@python.net>2005-06-20 13:45:34 (GMT)
committerMichael W. Hudson <mwh@python.net>2005-06-20 13:45:34 (GMT)
commit7390942aa16be9b894c31563ec9f2b502ed28338 (patch)
treec6141bd2b2d6eeedf72dbf3195b78f35cc586414
parent7b279078c0f59c37a91062ebf724f8f13287d5d6 (diff)
downloadcpython-7390942aa16be9b894c31563ec9f2b502ed28338.zip
cpython-7390942aa16be9b894c31563ec9f2b502ed28338.tar.gz
cpython-7390942aa16be9b894c31563ec9f2b502ed28338.tar.bz2
test_asynchat is no longer expected to produce output.
also, wait for threads to finish before proceeding.
-rw-r--r--Lib/test/output/test_asynchat3
-rw-r--r--Lib/test/test_asynchat.py4
2 files changed, 3 insertions, 4 deletions
diff --git a/Lib/test/output/test_asynchat b/Lib/test/output/test_asynchat
deleted file mode 100644
index e2e67f3..0000000
--- a/Lib/test/output/test_asynchat
+++ /dev/null
@@ -1,3 +0,0 @@
-test_asynchat
-Connected
-Received: 'hello world'
diff --git a/Lib/test/test_asynchat.py b/Lib/test/test_asynchat.py
index d10e389..f93587a 100644
--- a/Lib/test/test_asynchat.py
+++ b/Lib/test/test_asynchat.py
@@ -6,7 +6,7 @@ import unittest
from test import test_support
HOST = "127.0.0.1"
-PORT = 54321
+PORT = 54322
class echo_server(threading.Thread):
@@ -67,6 +67,7 @@ class TestAsynchat(unittest.TestCase):
c.push("hello ")
c.push("world\n")
asyncore.loop()
+ s.join()
self.assertEqual(c.contents, 'hello world')
@@ -79,6 +80,7 @@ class TestAsynchat(unittest.TestCase):
c.push("hello ")
c.push("world\n")
asyncore.loop()
+ s.join()
self.assertEqual(c.contents, 'hello ')