[Python-checkins] r61627 - in python/trunk: Lib/test/test_nis.py Misc/NEWS

[brett.cannon]

Author: brett.cannon
Date: Wed Mar 19 17:50:13 2008
New Revision: 61627

Modified:
   python/trunk/Lib/test/test_nis.py
   python/trunk/Misc/NEWS
Log:
test_nis would fail if test.test_support.verbose was true but NIS was not set
up on the machine.

Closes issue2411. Thanks Michael Bishop.


Modified: python/trunk/Lib/test/test_nis.py
==============================================================================
--- python/trunk/Lib/test/test_nis.py	(original)
+++ python/trunk/Lib/test/test_nis.py	Wed Mar 19 17:50:13 2008
@@ -1,4 +1,4 @@
-from test.test_support import verbose, run_unittest
+from test import test_support
 import unittest
 import nis
 
@@ -8,8 +8,10 @@
             maps = nis.maps()
         except nis.error, msg:
             # NIS is probably not active, so this test isn't useful
-            if verbose:
-                self.fail("(failing because of verbose mode) %s" % msg)
+            if test_support.verbose:
+                print "Test Skipped:", msg
+            # Can't raise TestSkipped as regrtest only recognizes the exception
+            #   import time.
             return
         try:
             # On some systems, this map is only accessible to the
@@ -35,7 +37,7 @@
                 break
 
 def test_main():
-    run_unittest(NisTests)
+    test_support.run_unittest(NisTests)
 
 if __name__ == '__main__':
     test_main()

Modified: python/trunk/Misc/NEWS
==============================================================================
--- python/trunk/Misc/NEWS	(original)
+++ python/trunk/Misc/NEWS	Wed Mar 19 17:50:13 2008
@@ -99,6 +99,9 @@
 Tests
 -----
 
+- test_nis no longer fails when test.test_support.verbose is true and NIS is
+  not set up on the testing machine.
+
 - Output comparison tests are no longer supported.
 
 - Rewrite test_errno to use unittest and no longer be a no-op.