summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2010-09-12 13:58:34 (GMT)
committerBenjamin Peterson <benjamin@python.org>2010-09-12 13:58:34 (GMT)
commitee906192b50d078bac65ef2f18a53318169e7992 (patch)
tree6991d1675178c49a9b1a05e930f80935b2e71f2d /Lib
parent7f536b03a28d11b64a9e6657a6dbd9ad05d37b2f (diff)
downloadcpython-ee906192b50d078bac65ef2f18a53318169e7992.zip
cpython-ee906192b50d078bac65ef2f18a53318169e7992.tar.gz
cpython-ee906192b50d078bac65ef2f18a53318169e7992.tar.bz2
Merged revisions 84735 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r84735 | benjamin.peterson | 2010-09-12 08:55:02 -0500 (Sun, 12 Sep 2010) | 1 line reenable test_nis on solaris #3402 ........
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_nis.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/Lib/test/test_nis.py b/Lib/test/test_nis.py
index 7aad33d..1fb5434 100644
--- a/Lib/test/test_nis.py
+++ b/Lib/test/test_nis.py
@@ -4,7 +4,6 @@ import unittest
# Skip test if nis module does not exist.
nis = support.import_module('nis')
-raise unittest.SkipTest("test_nis hangs on Solaris")
class NisTests(unittest.TestCase):
def test_maps(self):