From eeaf4dd8b4d5f73d696709cecb7beac6cd5c89c5 Mon Sep 17 00:00:00 2001 From: Aleksey Lim Date: Tue, 6 Apr 2010 19:33:16 +0000 Subject: [PATCH] Let using unittest.main's command line arguments #2982815 --- tests/testalias.py | 2 -- tests/testall.py | 3 ++- tests/testarch.py | 2 -- tests/testautopolicy.py | 2 -- tests/testdistro.py | 2 -- tests/testdownload.py | 2 -- tests/testgpg.py | 2 -- tests/testifacecache.py | 2 -- tests/testlaunch.py | 2 -- tests/testmanifest.py | 2 -- tests/testmodel.py | 2 -- tests/testpolicy.py | 2 -- tests/testqdom.py | 2 -- tests/testreader.py | 2 -- tests/testsat.py | 2 -- tests/testselections.py | 2 -- tests/testsolver.py | 2 -- tests/teststore.py | 2 -- tests/testtrust.py | 2 -- tests/testunpack.py | 9 +++------ tests/testwriter.py | 2 -- 21 files changed, 5 insertions(+), 45 deletions(-) diff --git a/tests/testalias.py b/tests/testalias.py index a40101d..a96aea4 100755 --- a/tests/testalias.py +++ b/tests/testalias.py @@ -65,7 +65,5 @@ class TestAlias(BaseTest): except alias.NotAnAliasScript: pass -suite = unittest.makeSuite(TestAlias) if __name__ == '__main__': - sys.argv.append('-v') unittest.main() diff --git a/tests/testall.py b/tests/testall.py index cf41dc2..36496e6 100755 --- a/tests/testall.py +++ b/tests/testall.py @@ -26,7 +26,8 @@ alltests = unittest.TestSuite() for name in suite_names: m = __import__(name, globals(), locals(), []) - alltests.addTest(m.suite) + test = unittest.defaultTestLoader.loadTestsFromModule(m) + alltests.addTest(test) a = unittest.TextTestRunner(verbosity=2).run(alltests) diff --git a/tests/testarch.py b/tests/testarch.py index ee97440..e30e05c 100644 --- a/tests/testarch.py +++ b/tests/testarch.py @@ -26,7 +26,5 @@ class TestArch(BaseTest): arch = get_architecture('Linux', 'i686') assert ('i386' in arch.machine_ranks) -suite = unittest.makeSuite(TestArch) if __name__ == '__main__': - sys.argv.append('-v') unittest.main() diff --git a/tests/testautopolicy.py b/tests/testautopolicy.py index f8118b8..82e3b93 100755 --- a/tests/testautopolicy.py +++ b/tests/testautopolicy.py @@ -418,7 +418,5 @@ class TestAutoPolicy(BaseTest): policy.recalculate() assert policy.implementation[bar_iface].id == 'sha1=150' -suite = unittest.makeSuite(TestAutoPolicy) if __name__ == '__main__': - sys.argv.append('-v') unittest.main() diff --git a/tests/testdistro.py b/tests/testdistro.py index 12252d6..3ae5d7a 100755 --- a/tests/testdistro.py +++ b/tests/testdistro.py @@ -145,7 +145,5 @@ class TestDistro(BaseTest): self.assertEquals('0.3-post1-rc2', distro.try_cleanup_distro_version('0.3-post1-rc2')) self.assertEquals('0.3.1-2', distro.try_cleanup_distro_version('0.3.1-r2-r3')) -suite = unittest.makeSuite(TestDistro) if __name__ == '__main__': - sys.argv.append('-v') unittest.main() diff --git a/tests/testdownload.py b/tests/testdownload.py index ed439ff..b130872 100755 --- a/tests/testdownload.py +++ b/tests/testdownload.py @@ -383,7 +383,5 @@ class TestDownload(BaseTest): def testBackgroundVerbose(self): self.testBackground(verbose = True) -suite = unittest.makeSuite(TestDownload) if __name__ == '__main__': - sys.argv.append('-v') unittest.main() diff --git a/tests/testgpg.py b/tests/testgpg.py index ff0c00e..993fc8f 100755 --- a/tests/testgpg.py +++ b/tests/testgpg.py @@ -205,7 +205,5 @@ class TestGPG(BaseTest): self.assertEquals('Thomas Leonard ', key.name) -suite = unittest.makeSuite(TestGPG) if __name__ == '__main__': - sys.argv.append('-v') unittest.main() diff --git a/tests/testifacecache.py b/tests/testifacecache.py index 37cd93c..adeb592 100755 --- a/tests/testifacecache.py +++ b/tests/testifacecache.py @@ -149,7 +149,5 @@ class TestIfaceCache(BaseTest): self.assertEquals(None, iface_cache.get_last_check_attempt("http://foo/bar2.xml")) -suite = unittest.makeSuite(TestIfaceCache) if __name__ == '__main__': - sys.argv.append('-v') unittest.main() diff --git a/tests/testlaunch.py b/tests/testlaunch.py index 6f544d0..03da8a7 100755 --- a/tests/testlaunch.py +++ b/tests/testlaunch.py @@ -198,7 +198,5 @@ class TestLaunch(BaseTest): finally: os.dup2(copy, 1) -suite = unittest.makeSuite(TestLaunch) if __name__ == '__main__': - sys.argv.append('-v') unittest.main() diff --git a/tests/testmanifest.py b/tests/testmanifest.py index 41666d9..b615b3a 100755 --- a/tests/testmanifest.py +++ b/tests/testmanifest.py @@ -118,7 +118,5 @@ class TestManifest(BaseTest): except BadDigest: pass -suite = unittest.makeSuite(TestManifest) if __name__ == '__main__': - sys.argv.append('-v') unittest.main() diff --git a/tests/testmodel.py b/tests/testmodel.py index 38eae4a..7bb6844 100755 --- a/tests/testmodel.py +++ b/tests/testmodel.py @@ -276,7 +276,5 @@ class TestModel(BaseTest): assert pv('2-post999') < pv('3-pre1') -suite = unittest.makeSuite(TestModel) if __name__ == '__main__': - sys.argv.append('-v') unittest.main() diff --git a/tests/testpolicy.py b/tests/testpolicy.py index 18a0c9f..cd36445 100755 --- a/tests/testpolicy.py +++ b/tests/testpolicy.py @@ -32,7 +32,5 @@ class TestPolicy(BaseTest): assert p.implementation[foo].id == 'sha1=234' # The source assert p.implementation[compiler].id == 'sha1=345' # A binary needed to compile it -suite = unittest.makeSuite(TestPolicy) if __name__ == '__main__': - sys.argv.append('-v') unittest.main() diff --git a/tests/testqdom.py b/tests/testqdom.py index 10e22e1..87e8dff 100755 --- a/tests/testqdom.py +++ b/tests/testqdom.py @@ -67,7 +67,5 @@ class TestQDom(BaseTest): 'hi') assert 'root' in str(root) -suite = unittest.makeSuite(TestQDom) if __name__ == '__main__': - sys.argv.append('-v') unittest.main() diff --git a/tests/testreader.py b/tests/testreader.py index 36870f7..94a59a6 100755 --- a/tests/testreader.py +++ b/tests/testreader.py @@ -257,7 +257,5 @@ class TestReader(BaseTest): self.assertEquals('fr en_GB', iface.implementations['sha1=234'].langs) self.assertEquals(None, iface.implementations['sha1=345'].langs) -suite = unittest.makeSuite(TestReader) if __name__ == '__main__': - sys.argv.append('-v') unittest.main() diff --git a/tests/testsat.py b/tests/testsat.py index 31201d3..1079cb6 100755 --- a/tests/testsat.py +++ b/tests/testsat.py @@ -321,7 +321,5 @@ class TestSAT(BaseTest): libb[1,3] => libc 1 3 """) -suite = unittest.makeSuite(TestSAT) if __name__ == '__main__': - sys.argv.append('-v') unittest.main() diff --git a/tests/testselections.py b/tests/testselections.py index 2c66230..3f43991 100755 --- a/tests/testselections.py +++ b/tests/testselections.py @@ -77,7 +77,5 @@ class TestSelections(BaseTest): local_path = s2.selections[iface].local_path assert os.path.isdir(local_path), local_path -suite = unittest.makeSuite(TestSelections) if __name__ == '__main__': - sys.argv.append('-v') unittest.main() diff --git a/tests/testsolver.py b/tests/testsolver.py index 15ff733..cb19d9c 100755 --- a/tests/testsolver.py +++ b/tests/testsolver.py @@ -136,7 +136,5 @@ class TestSolver(BaseTest): '0.1 Linux-i686', '0.1 Linux-i586', '0.1 Linux-i486'], # ordering of x86 versions selected) -suite = unittest.makeSuite(TestSolver) if __name__ == '__main__': - sys.argv.append('-v') unittest.main() diff --git a/tests/teststore.py b/tests/teststore.py index cf6f1c1..b82764f 100755 --- a/tests/teststore.py +++ b/tests/teststore.py @@ -203,7 +203,5 @@ class TestStore(BaseTest): finally: support.ro_rmtree(copy) -suite = unittest.makeSuite(TestStore) if __name__ == '__main__': - sys.argv.append('-v') unittest.main() diff --git a/tests/testtrust.py b/tests/testtrust.py index 2e712e0..63868dd 100755 --- a/tests/testtrust.py +++ b/tests/testtrust.py @@ -80,7 +80,5 @@ class TestTrust(BaseTest): self.assertRaises(SafeException, lambda: trust.domain_from_url('')) -suite = unittest.makeSuite(TestTrust) if __name__ == '__main__': - sys.argv.append('-v') unittest.main() diff --git a/tests/testunpack.py b/tests/testunpack.py index 298a87a..959789a 100755 --- a/tests/testunpack.py +++ b/tests/testunpack.py @@ -140,12 +140,9 @@ class TestUnpackGNU(AbstractTestUnpack): unpack.unpack_archive('ftp://foo/file.tar.lzma', file('HelloWorld.tar.lzma'), self.tmpdir) self.assert_manifest('sha1new=290eb133e146635fe37713fd58174324a16d595f') -suite = unittest.TestSuite() -if unpack._gnu_tar(): - suite.addTest(unittest.makeSuite(TestUnpackGNU)) -else: +if not unpack._gnu_tar(): print "No GNU tar: SKIPPING tests" -suite.addTest(unittest.makeSuite(TestUnpackPython)) + del globals()['TestUnpackGNU'] if __name__ == '__main__': - unittest.TextTestRunner(verbosity=2).run(suite) + unittest.main() diff --git a/tests/testwriter.py b/tests/testwriter.py index 2a50f51..956d04c 100755 --- a/tests/testwriter.py +++ b/tests/testwriter.py @@ -66,7 +66,5 @@ class TestWriter(BaseTest): impl = iface.implementations['sha1=3ce644dc725f1d21cfcf02562c76f375944b266a'] self.assertEquals(model.developer, impl.user_stability) -suite = unittest.makeSuite(TestWriter) if __name__ == '__main__': - sys.argv.append('-v') unittest.main() -- 2.11.4.GIT