diff options
author | Zachary Ware <zachary.ware@gmail.com> | 2014-07-07 14:35:02 -0500 |
---|---|---|
committer | Zachary Ware <zachary.ware@gmail.com> | 2014-07-07 14:35:02 -0500 |
commit | e55c07614b4f6d4961a2d3fc9af4cf92c2b2615c (patch) | |
tree | 6eabbaa47b0066ea2480864b78e69c645daed3da /Lib/test/test_asyncore.py | |
parent | bb715c3208e98a5abf245de2fcfd7e93e28614e0 (diff) | |
parent | 8eb1f397f7637f49e102198ef49e156e229b09de (diff) | |
download | cpython-e55c07614b4f6d4961a2d3fc9af4cf92c2b2615c.tar.gz |
Issue #17846: Merge with 3.4
Diffstat (limited to 'Lib/test/test_asyncore.py')
-rw-r--r-- | Lib/test/test_asyncore.py | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/Lib/test/test_asyncore.py b/Lib/test/test_asyncore.py index 6cfe580026..b4f474f014 100644 --- a/Lib/test/test_asyncore.py +++ b/Lib/test/test_asyncore.py @@ -7,7 +7,6 @@ import sys import time import errno import struct -import warnings from test import support from io import BytesIO @@ -298,23 +297,6 @@ class DispatcherTests(unittest.TestCase): 'warning: unhandled connect event'] self.assertEqual(lines, expected) - def test_issue_8594(self): - # XXX - this test is supposed to be removed in next major Python - # version - d = asyncore.dispatcher(socket.socket()) - # make sure the error message no longer refers to the socket - # object but the dispatcher instance instead - self.assertRaisesRegex(AttributeError, 'dispatcher instance', - getattr, d, 'foo') - # cheap inheritance with the underlying socket is supposed - # to still work but a DeprecationWarning is expected - with warnings.catch_warnings(record=True) as w: - warnings.simplefilter("always") - family = d.family - self.assertEqual(family, socket.AF_INET) - self.assertEqual(len(w), 1) - self.assertTrue(issubclass(w[0].category, DeprecationWarning)) - def test_strerror(self): # refers to bug #8573 err = asyncore._strerror(errno.EPERM) @@ -331,9 +313,8 @@ class dispatcherwithsend_noread(asyncore.dispatcher_with_send): def handle_connect(self): pass -class DispatcherWithSendTests(unittest.TestCase): - usepoll = False +class DispatcherWithSendTests(unittest.TestCase): def setUp(self): pass @@ -383,10 +364,6 @@ class DispatcherWithSendTests(unittest.TestCase): self.fail("join() timed out") - -class DispatcherWithSendTests_UsePoll(DispatcherWithSendTests): - usepoll = True - @unittest.skipUnless(hasattr(asyncore, 'file_wrapper'), 'asyncore.file_wrapper required') class FileWrapperTest(unittest.TestCase): |