diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2016-12-05 20:10:02 -0800 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2016-12-05 20:10:02 -0800 |
| commit | 748772e1f1e853466404978cf1269f6dd79b7fcb (patch) | |
| tree | 6eeb39fcf96e5e9a63664d0ecc7bb00f4fc7c8f0 | |
| parent | 1d3ce6de95ac602a1a27d9a09b5de557bee07abf (diff) | |
| parent | 1a03c7df54611500b2e91fa7eee7a8b74b62c737 (diff) | |
Merge branch '1.17' into 1.18
| -rw-r--r-- | sites/www/changelog.rst | 2 | ||||
| -rw-r--r-- | tests/test_packetizer.py | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst index 9a37c7b2..0ceca078 100644 --- a/sites/www/changelog.rst +++ b/sites/www/changelog.rst @@ -2,6 +2,8 @@ Changelog ========= +* :support:`801 (1.17+)` Skip a Unix-only test when on Windows; thanks to + Gabi Davar. * :support:`792 (1.17+)` Minor updates to the README and demos; thanks to Alan Yee. * :feature:`780 (1.18+)` (also :issue:`779`, and may help users affected by diff --git a/tests/test_packetizer.py b/tests/test_packetizer.py index 8faec03c..5fa54e4a 100644 --- a/tests/test_packetizer.py +++ b/tests/test_packetizer.py @@ -20,6 +20,7 @@ Some unit tests for the ssh2 protocol in Transport. """ +import sys import unittest from hashlib import sha1 @@ -33,7 +34,6 @@ from paramiko.common import byte_chr, zero_byte x55 = byte_chr(0x55) x1f = byte_chr(0x1f) - class PacketizerTest (unittest.TestCase): def test_1_write(self): @@ -75,6 +75,7 @@ class PacketizerTest (unittest.TestCase): self.assertEqual(1, m.get_int()) self.assertEqual(900, m.get_int()) + @unittest.skipIf(sys.platform.startswith("win"), 'no SIGALRM on windows') def test_3_closed(self): rsock = LoopSocket() wsock = LoopSocket() |