Temporarily disable the timeout and socket tests.
They still run as standalone scripts, but when used as part of the
regression test suite, they are effectively no-ops.
(This is done by renaming test_main to main.)
diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
index de105ba..b4540a4 100644
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -207,16 +207,16 @@
except AttributeError:
pass
-## def testHostnameRes(self):
-## """Testing hostname resolution mechanisms."""
-## hostname = socket.gethostname()
-## ip = socket.gethostbyname(hostname)
-## self.assert_(ip.find('.') >= 0, "Error resolving host to ip.")
-## hname, aliases, ipaddrs = socket.gethostbyaddr(ip)
-## all_host_names = [hname] + aliases
-## fqhn = socket.getfqdn()
-## if not fqhn in all_host_names:
-## self.fail("Error testing host resolution mechanisms.")
+ def testHostnameRes(self):
+ """Testing hostname resolution mechanisms."""
+ hostname = socket.gethostname()
+ ip = socket.gethostbyname(hostname)
+ self.assert_(ip.find('.') >= 0, "Error resolving host to ip.")
+ hname, aliases, ipaddrs = socket.gethostbyaddr(ip)
+ all_host_names = [hname] + aliases
+ fqhn = socket.getfqdn()
+ if not fqhn in all_host_names:
+ self.fail("Error testing host resolution mechanisms.")
def testRefCountGetNameInfo(self):
"""Testing reference count for getnameinfo."""
@@ -498,7 +498,7 @@
self.cli_file.write(MSG)
self.cli_file.flush()
-def test_main():
+def main():
suite = unittest.TestSuite()
suite.addTest(unittest.makeSuite(GeneralModuleTests))
suite.addTest(unittest.makeSuite(BasicTCPTest))
@@ -508,4 +508,4 @@
test_support.run_suite(suite)
if __name__ == "__main__":
- test_main()
+ main()
diff --git a/Lib/test/test_timeout.py b/Lib/test/test_timeout.py
index 7c72222..d79c4ee 100644
--- a/Lib/test/test_timeout.py
+++ b/Lib/test/test_timeout.py
@@ -175,11 +175,11 @@
pass
-def test_main():
+def main():
suite = unittest.TestSuite()
suite.addTest(unittest.makeSuite(CreationTestCase))
suite.addTest(unittest.makeSuite(TimeoutTestCase))
test_support.run_suite(suite)
if __name__ == "__main__":
- test_main()
+ main()