summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2008-08-19 23:02:38 (GMT)
committerBenjamin Peterson <benjamin@python.org>2008-08-19 23:02:38 (GMT)
commite9ea19e2e353b6ec4d02ab35299321da1cc91c65 (patch)
tree432ab59da7f8222a60cfefe5023a791a7d9dbccb /Lib
parent616d28566b6b61ec92059b0151b79bdcf487bc5a (diff)
downloadcpython-e9ea19e2e353b6ec4d02ab35299321da1cc91c65.zip
cpython-e9ea19e2e353b6ec4d02ab35299321da1cc91c65.tar.gz
cpython-e9ea19e2e353b6ec4d02ab35299321da1cc91c65.tar.bz2
disable test_nis; it hangs
Diffstat (limited to 'Lib')
-rwxr-xr-xLib/test/regrtest.py1
-rw-r--r--Lib/test/test_nis.py2
2 files changed, 3 insertions, 0 deletions
diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index 0c6d522..4eb4a64 100755
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -1135,6 +1135,7 @@ class _ExpectedSkips:
# These are broken tests, for now skipped on every platform.
# XXX Fix these!
self.expected.add('test_cProfile')
+ self.expected.add('test_nis')
# expected to be skipped on every platform, even Linux
if not os.path.supports_unicode_filenames:
diff --git a/Lib/test/test_nis.py b/Lib/test/test_nis.py
index 8a7efcf..1c17a4e 100644
--- a/Lib/test/test_nis.py
+++ b/Lib/test/test_nis.py
@@ -2,6 +2,8 @@ from test import support
import unittest
import nis
+raise support.TestSkipped("test_nis hangs on Solaris")
+
class NisTests(unittest.TestCase):
def test_maps(self):
try: