[Python-checkins] r84736 - in python/branches/release31-maint: Lib/test/test_nis.py

[benjamin.peterson]

Author: benjamin.peterson
Date: Sun Sep 12 15:58:34 2010
New Revision: 84736

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


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Lib/test/test_nis.py

Modified: python/branches/release31-maint/Lib/test/test_nis.py
==============================================================================
--- python/branches/release31-maint/Lib/test/test_nis.py	(original)
+++ python/branches/release31-maint/Lib/test/test_nis.py	Sun Sep 12 15:58:34 2010
@@ -4,7 +4,6 @@
 # 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):