diff options
| author | doko@ubuntu.com <doko@ubuntu.com> | 2014-04-17 17:49:00 (GMT) |
|---|---|---|
| committer | doko@ubuntu.com <doko@ubuntu.com> | 2014-04-17 17:49:00 (GMT) |
| commit | dc282134eed4b62322b7fac77c6c38f9b494e9ed (patch) | |
| tree | 448bb5677dd68bd14b8ee42a5b136037e7bbffc0 /Lib | |
| parent | 72f61de768dc17ad528e1b3c01a87998eff22cac (diff) | |
| parent | 4a173bc4edfbc731f227a84a26eb24b6aef91dd6 (diff) | |
| download | cpython-dc282134eed4b62322b7fac77c6c38f9b494e9ed.zip cpython-dc282134eed4b62322b7fac77c6c38f9b494e9ed.tar.gz cpython-dc282134eed4b62322b7fac77c6c38f9b494e9ed.tar.bz2 | |
- Merge 3.4
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/test/test_socket.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py index e94f539..aed10a7 100644 --- a/Lib/test/test_socket.py +++ b/Lib/test/test_socket.py @@ -867,7 +867,7 @@ class GeneralModuleTests(unittest.TestCase): # Find one service that exists, then check all the related interfaces. # I've ordered this by protocols that have both a tcp and udp # protocol, at least for modern Linuxes. - if (sys.platform.startswith(('freebsd', 'netbsd')) + if (sys.platform.startswith(('freebsd', 'netbsd', 'gnukfreebsd')) or sys.platform in ('linux', 'darwin')): # avoid the 'echo' service on this platform, as there is an # assumption breaking non-standard port/protocol entry |