From: Brett Cannon Date: Wed, 19 Mar 2008 16:50:13 +0000 (+0000) Subject: test_nis would fail if test.test_support.verbose was true but NIS was not set X-Git-Tag: v2.6a2~223 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7919d98d566c7c1491636e69d61b816358023914;p=python 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. --- diff --git a/Lib/test/test_nis.py b/Lib/test/test_nis.py index 590868f010..c958d4b23a 100644 --- a/Lib/test/test_nis.py +++ b/Lib/test/test_nis.py @@ -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 @@ class NisTests(unittest.TestCase): 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 @@ class NisTests(unittest.TestCase): break def test_main(): - run_unittest(NisTests) + test_support.run_unittest(NisTests) if __name__ == '__main__': test_main() diff --git a/Misc/NEWS b/Misc/NEWS index 5b2292d570..d787eb063b 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -99,6 +99,9 @@ Library 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.