diff options
author | Jeff Forcier <jeff@bitprophet.org> | 2019-06-09 19:32:21 -0400 |
---|---|---|
committer | Jeff Forcier <jeff@bitprophet.org> | 2019-06-09 19:32:21 -0400 |
commit | cf0c0efad500f3096aa10841edf12a5cc6050b06 (patch) | |
tree | 1749d8f41cea1333522f519b1f3314bf3e82e0b6 /tests/test_packetizer.py | |
parent | 4f77e76b8caaf3645841e291ab5081d415b14acb (diff) | |
parent | 224e284fa1694073117428d6eee49d7f88516c69 (diff) |
Merge branch 'master' into 1233-int
Diffstat (limited to 'tests/test_packetizer.py')
-rw-r--r-- | tests/test_packetizer.py | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/tests/test_packetizer.py b/tests/test_packetizer.py index dbe5993e..de80770e 100644 --- a/tests/test_packetizer.py +++ b/tests/test_packetizer.py @@ -38,8 +38,7 @@ x1f = byte_chr(0x1f) class PacketizerTest(unittest.TestCase): - - def test_1_write(self): + def test_write(self): rsock = LoopSocket() wsock = LoopSocket() rsock.link(wsock) @@ -65,11 +64,11 @@ class PacketizerTest(unittest.TestCase): # 32 + 12 bytes of MAC = 44 self.assertEqual(44, len(data)) self.assertEqual( - b"\x43\x91\x97\xbd\x5b\x50\xac\x25\x87\xc2\xc4\x6b\xc7\xe9\x38\xc0", + b"\x43\x91\x97\xbd\x5b\x50\xac\x25\x87\xc2\xc4\x6b\xc7\xe9\x38\xc0", # noqa data[:16], ) - def test_2_read(self): + def test_read(self): rsock = LoopSocket() wsock = LoopSocket() rsock.link(wsock) @@ -83,7 +82,7 @@ class PacketizerTest(unittest.TestCase): ).decryptor() p.set_inbound_cipher(decryptor, 16, sha1, 12, x1f * 20) wsock.send( - b"\x43\x91\x97\xbd\x5b\x50\xac\x25\x87\xc2\xc4\x6b\xc7\xe9\x38\xc0\x90\xd2\x16\x56\x0d\x71\x73\x61\x38\x7c\x4c\x3d\xfb\x97\x7d\xe2\x6e\x03\xb1\xa0\xc2\x1c\xd6\x41\x41\x4c\xb4\x59" + b"\x43\x91\x97\xbd\x5b\x50\xac\x25\x87\xc2\xc4\x6b\xc7\xe9\x38\xc0\x90\xd2\x16\x56\x0d\x71\x73\x61\x38\x7c\x4c\x3d\xfb\x97\x7d\xe2\x6e\x03\xb1\xa0\xc2\x1c\xd6\x41\x41\x4c\xb4\x59" # noqa ) cmd, m = p.read_message() self.assertEqual(100, cmd) @@ -91,7 +90,7 @@ class PacketizerTest(unittest.TestCase): self.assertEqual(1, m.get_int()) self.assertEqual(900, m.get_int()) - def test_3_closed(self): + def test_closed(self): if sys.platform.startswith("win"): # no SIGALRM on windows return rsock = LoopSocket() @@ -121,7 +120,6 @@ class PacketizerTest(unittest.TestCase): import signal class TimeoutError(Exception): - def __init__(self, error_message): if hasattr(errno, "ETIME"): self.message = os.sterror(errno.ETIME) @@ -129,9 +127,7 @@ class PacketizerTest(unittest.TestCase): self.messaage = error_message def timeout(seconds=1, error_message="Timer expired"): - def decorator(func): - def _handle_timeout(signum, frame): raise TimeoutError(error_message) |