From: Georg Brandl Date: Sun, 29 Oct 2006 19:24:43 +0000 (+0000) Subject: Convert test_nis to unittest. X-Git-Tag: v2.6a1~2484 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=850b2be67edc05a4577876f35ae68f8553527d6a;p=python Convert test_nis to unittest. --- diff --git a/Lib/test/output/test_nis b/Lib/test/output/test_nis deleted file mode 100644 index 0853ab4775..0000000000 --- a/Lib/test/output/test_nis +++ /dev/null @@ -1,2 +0,0 @@ -test_nis -nis.maps() diff --git a/Lib/test/test_nis.py b/Lib/test/test_nis.py index 74ceeea910..590868f010 100644 --- a/Lib/test/test_nis.py +++ b/Lib/test/test_nis.py @@ -1,39 +1,41 @@ -from test.test_support import verbose, TestFailed, TestSkipped +from test.test_support import verbose, run_unittest +import unittest import nis -print 'nis.maps()' -try: - maps = nis.maps() -except nis.error, 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 TestSkipped, msg +class NisTests(unittest.TestCase): + def test_maps(self): + 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) + return + try: + # On some systems, this map is only accessible to the + # super user + maps.remove("passwd.adjunct.byname") + except ValueError: + pass -try: - # On some systems, this map is only accessible to the - # super user - maps.remove("passwd.adjunct.byname") -except ValueError: - pass + done = 0 + for nismap in maps: + mapping = nis.cat(nismap) + for k, v in mapping.items(): + if not k: + continue + if nis.match(k, nismap) != v: + self.fail("NIS match failed for key `%s' in map `%s'" % (k, nismap)) + else: + # just test the one key, otherwise this test could take a + # very long time + done = 1 + break + if done: + break -done = 0 -for nismap in maps: - if verbose: - print nismap - mapping = nis.cat(nismap) - for k, v in mapping.items(): - if verbose: - print ' ', k, v - if not k: - continue - if nis.match(k, nismap) != v: - print "NIS match failed for key `%s' in map `%s'" % (k, nismap) - else: - # just test the one key, otherwise this test could take a - # very long time - done = 1 - break - if done: - break +def test_main(): + run_unittest(NisTests) + +if __name__ == '__main__': + test_main()