Slight reworking of this test. If nis.maps() gives a nis.error, then

raise an ImportError if not running verbose.  This signals to the
regression framework that this test isn't applicable.

diff --git a/Lib/test/test_nis.py b/Lib/test/test_nis.py
index b28a6722d2bce8214b31b24b814c5d3ab995847c..b73faf9e89774cbaf7d9645a6afc83290d701a3a 100644 (file)
--- a/Lib/test/test_nis.py
+++ b/Lib/test/test_nis.py
@@ -3,10 +3,13 @@ import nis
 
 print 'nis.maps()'
 try:
-    # the following could fail if NIS isn't active
     maps = nis.maps()
 except nis.error, msg:
-    raise TestFailed, msg 
+    # NIS is probably not active, so this test isn't useful
+    if verbose:
+        raise TestFailed, msg
+    # only do this if running under the regression suite
+    raise ImportError, msg
 
 done = 0
 for nismap in maps: