From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 12 Sep 2010 13:58:34 +0000 (+0000)
Subject: Merged revisions 84735 via svnmerge from
X-Git-Tag: v3.1.3rc1~241
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ee906192b50d078bac65ef2f18a53318169e7992;p=python

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
........
---

diff --git a/Lib/test/test_nis.py b/Lib/test/test_nis.py
index 7aad33d55d..1fb5434dca 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):