summaryrefslogtreecommitdiffstats
path: root/Lib/test
diff options
context:
space:
mode:
Diffstat (limited to 'Lib/test')
-rw-r--r--Lib/test/test_socket.py17
1 files changed, 8 insertions, 9 deletions
diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
index 44b42ff..301cd70 100644
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -248,15 +248,14 @@ class GeneralModuleTests(unittest.TestCase):
pass
def testNtoH(self):
- def twice(f):
- def g(x):
- return f(f(x))
- return g
- for i in (0, 1, 0xffff0000, 2L, (2**32L) - 1):
- self.assertEqual(i, twice(socket.htonl)(i))
- self.assertEqual(i, twice(socket.ntohl)(i))
- self.assertRaises(OverflowError, socket.htonl, 2L**34)
- self.assertRaises(OverflowError, socket.ntohl, 2L**34)
+ for func in socket.htonl, socket.ntohl:
+ for i in (0, 1, 0xffff0000, 2L):
+ self.assertEqual(i, func(func(i)))
+
+ biglong = 2**32L - 1
+ swapped = func(biglong)
+ self.assert_(swapped == biglong or swapped == -1)
+ self.assertRaises(OverflowError, func, 2L**34)
def testGetServByName(self):
"""Testing getservbyname()."""