Index: Lib/test/test_nis.py =================================================================== --- Lib/test/test_nis.py (revision 61572) +++ Lib/test/test_nis.py (working copy) @@ -1,4 +1,4 @@ -from test.test_support import verbose, run_unittest +from test import test_support import unittest import nis @@ -7,9 +7,9 @@ try: 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) + # NIS is probably not active, or installed but not configured + if test_support.verbose: + print 'Test Skipped:', msg return try: # On some systems, this map is only accessible to the @@ -35,7 +35,7 @@ break def test_main(): - run_unittest(NisTests) + test_support.run_unittest(NisTests) if __name__ == '__main__': test_main()