summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorNeal Norwitz <nnorwitz@gmail.com>2003-02-28 19:57:03 (GMT)
committerNeal Norwitz <nnorwitz@gmail.com>2003-02-28 19:57:03 (GMT)
commit55b61d21d8e8409fbb6ca23421f8a3a5c23f5513 (patch)
treeaa6d2f9c10dbda56efe1be4ba1350c32e546e9bc /Lib
parent6e2d1c7ab83eef723176861ac2bc0732f10ba1ca (diff)
downloadcpython-55b61d21d8e8409fbb6ca23421f8a3a5c23f5513.zip
cpython-55b61d21d8e8409fbb6ca23421f8a3a5c23f5513.tar.gz
cpython-55b61d21d8e8409fbb6ca23421f8a3a5c23f5513.tar.bz2
Fix SF bugs #692951 and 692988, test_timeout.py needs 'network' resource
require -u network to run test_timeout since it fails when not connected to a network.
Diffstat (limited to 'Lib')
-rwxr-xr-xLib/test/regrtest.py7
-rw-r--r--Lib/test/test_timeout.py5
2 files changed, 12 insertions, 0 deletions
diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index 93c5011..7377568 100755
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -543,6 +543,9 @@ def printlist(x, width=70, indent=4):
# test_socket_ssl
# Controlled by test_socket_ssl.skip_expected. Requires the network
# resource, and a socket module with ssl support.
+# test_timeout
+# Controlled by test_timeout.skip_expected. Requires the network
+# resource and a socket module.
_expectations = {
'win32':
@@ -945,6 +948,7 @@ class _ExpectedSkips:
import os.path
from test import test_normalization
from test import test_socket_ssl
+ from test import test_timeout
self.valid = False
if sys.platform in _expectations:
@@ -960,6 +964,9 @@ class _ExpectedSkips:
if test_socket_ssl.skip_expected:
self.expected.add('test_socket_ssl')
+ if test_timeout.skip_expected:
+ self.expected.add('test_timeout')
+
if not sys.platform in ("mac", "darwin"):
self.expected.add("test_macostools")
self.expected.add("test_macfs")
diff --git a/Lib/test/test_timeout.py b/Lib/test/test_timeout.py
index 5949e51..07c5372 100644
--- a/Lib/test/test_timeout.py
+++ b/Lib/test/test_timeout.py
@@ -3,6 +3,9 @@
import unittest
from test import test_support
+# This requires the 'network' resource as given on the regrtest command line.
+skip_expected = not test_support.is_resource_enabled('network')
+
import time
import socket
@@ -182,6 +185,8 @@ class TimeoutTestCase(unittest.TestCase):
def test_main():
+ test_support.requires('network')
+
suite = unittest.TestSuite()
suite.addTest(unittest.makeSuite(CreationTestCase))
suite.addTest(unittest.makeSuite(TimeoutTestCase))