Remove unneeded TestSuite code from tests

jerrykan · jerrykan · commit 9e2df420d170 · 2016-01-12T23:26:04.000+11:00
The TestSuite code is no longer needed now that we are using py.test
which can automatically discover tests
diff --git a/test/test_actions.py b/test/test_actions.py
@@ -341,19 +341,4 @@ def testLinkNewToExisting(self):
             pass
         self.assertEqual(expect, self.result)
 
-def test_suite():
-    suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(RetireActionTestCase))
-    suite.addTest(unittest.makeSuite(StandardSearchActionTestCase))
-    suite.addTest(unittest.makeSuite(FakeFilterVarsTestCase))
-    suite.addTest(unittest.makeSuite(ShowActionTestCase))
-    suite.addTest(unittest.makeSuite(CollisionDetectionTestCase))
-    suite.addTest(unittest.makeSuite(LoginTestCase))
-    suite.addTest(unittest.makeSuite(EditItemActionTestCase))
-    return suite
-
-if __name__ == '__main__':
-    runner = unittest.TextTestRunner()
-    unittest.main(testRunner=runner)
-
 # vim: set et sts=4 sw=4 :
diff --git a/test/test_anydbm.py b/test/test_anydbm.py
@@ -52,20 +52,4 @@ class anydbmHTMLItemTest(HTMLItemTest, unittest.TestCase):
 class anydbmSessionTest(anydbmOpener, DBMTest, unittest.TestCase):
     pass
 
-def test_suite():
-    suite = unittest.TestSuite()
-    print 'Including anydbm tests'
-    suite.addTest(unittest.makeSuite(anydbmDBTest))
-    suite.addTest(unittest.makeSuite(anydbmROTest))
-    suite.addTest(unittest.makeSuite(anydbmSchemaTest))
-    suite.addTest(unittest.makeSuite(anydbmClassicInitTest))
-    suite.addTest(unittest.makeSuite(anydbmHTMLItemTest))
-    suite.addTest(unittest.makeSuite(anydbmSessionTest))
-    return suite
-
-if __name__ == '__main__':
-    runner = unittest.TextTestRunner()
-    unittest.main(testRunner=runner)
-
-
 # vim: set filetype=python ts=4 sw=4 et si
diff --git a/test/test_cgi.py b/test/test_cgi.py
@@ -977,18 +977,4 @@ def testCSVExportFailPermission(self):
         self.assertRaises(exceptions.SeriousError,
             actions.ExportCSVAction(cl).handle)
 
-
-def test_suite():
-    suite = unittest.TestSuite()
-
-def test_suite():
-    suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(FormTestCase))
-    suite.addTest(unittest.makeSuite(MessageTestCase))
-    return suite
-
-if __name__ == '__main__':
-    runner = unittest.TextTestRunner()
-    unittest.main(testRunner=runner)
-
 # vim: set filetype=python sts=4 sw=4 et si :
diff --git a/test/test_dates.py b/test/test_dates.py
@@ -508,21 +508,4 @@ def testRange(self):
             ae(str(r.to_value), '2006-%02d-%02d.23:59:59'%(i,
                 calendar.mdays[i]))
 
-
-def test_suite():
-    suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(DateTestCase))
-    suite.addTest(unittest.makeSuite(RangeTestCase))
-    try:
-        import pytz
-    except ImportError:
-        pass
-    else:
-        suite.addTest(unittest.makeSuite(TimezoneTestCase))
-    return suite
-
-if __name__ == '__main__':
-    runner = unittest.TextTestRunner()
-    unittest.main(testRunner=runner)
-
 # vim: set filetype=python sts=4 sw=4 et si :
diff --git a/test/test_hyperdbvals.py b/test/test_hyperdbvals.py
@@ -129,12 +129,4 @@ def testMultilink(self):
         self.assertEqual(self._test('multilink', '+valid', None), ['1'])
         self.assertEqual(self._test('multilink', '', None), [])
 
-def test_suite():
-    suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(RawToHyperdbTest))
-    return suite
-
-if __name__ == '__main__':
-    runner = unittest.TextTestRunner()
-    unittest.main(testRunner=runner)
 # vim: set filetype=python ts=4 sw=4 et si
diff --git a/test/test_indexer.py b/test/test_indexer.py
@@ -201,46 +201,4 @@ def tearDown(self):
 class sqliteIndexerTest(sqliteOpener, RDBMSIndexerTest, IndexerTest):
     pass
 
-def test_suite():
-    suite = unittest.TestSuite()
-
-    suite.addTest(unittest.makeSuite(IndexerTest))
-
-    try:
-        import xapian
-        suite.addTest(unittest.makeSuite(XapianIndexerTest))
-    except ImportError:
-        print "Skipping Xapian indexer tests"
-        pass
-
-    if have_backend('postgresql'):
-        # make sure we start with a clean slate
-        if postgresqlOpener.module.db_exists(config):
-            postgresqlOpener.module.db_nuke(config, 1)
-        suite.addTest(unittest.makeSuite(postgresqlIndexerTest))
-    else:
-        print "Skipping postgresql indexer tests"
-
-    if have_backend('mysql'):
-        # make sure we start with a clean slate
-        if mysqlOpener.module.db_exists(config):
-            mysqlOpener.module.db_nuke(config)
-        suite.addTest(unittest.makeSuite(mysqlIndexerTest))
-    else:
-        print "Skipping mysql indexer tests"
-
-    if have_backend('sqlite'):
-        # make sure we start with a clean slate
-        if sqliteOpener.module.db_exists(config):
-            sqliteOpener.module.db_nuke(config)
-        suite.addTest(unittest.makeSuite(sqliteIndexerTest))
-    else:
-        print "Skipping sqlite indexer tests"
-
-    return suite
-
-if __name__ == '__main__':
-    runner = unittest.TextTestRunner()
-    unittest.main(testRunner=runner)
-
 # vim: set filetype=python ts=4 sw=4 et si
diff --git a/test/test_init.py b/test/test_init.py
@@ -24,13 +24,4 @@ def testLoadTemplateInfo(self):
             }
         )
 
-def test_suite():
-    suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(TemplateInfoTestCase))
-    return suite
-
-if __name__ == '__main__':
-    runner = unittest.TextTestRunner()
-    unittest.main(testRunner=runner)
-
 # vim: set et sts=4 sw=4 :
diff --git a/test/test_jinja2.py b/test/test_jinja2.py
@@ -49,26 +49,12 @@ def test_zero(self):
         pass
 
 
+# only using one database backend for now, not sure if doing all
+# backends will keep the test focussed enough to be useful for the used
+# computing time. Would be okay to change in the future.
 class anydbmJinja2Test(Jinja2Test, unittest.TestCase):
     backend = 'anydbm'
 
-
-def test_suite():
-    suite = unittest.TestSuite()
-
-    suite.addTest(unittest.makeSuite(TestCase_Zero))
-
-    # only using one database backend for now, not sure if doing all
-    # backends will keep the test focussed enough to be useful for the used
-    # computing time. Would be okay to change in the future.
-    # for l in list_backends():
-    suite.addTest(unittest.makeSuite(anydbmJinja2Test))
-
-    return suite
-
-# Other roundup test source files have an if __name__ == '__main__': here
-# but I'm not sure if this is still helpful. So left out for now.
-
 # vim: ts=4 et sts=4 sw=4 ai :
 
 
diff --git a/test/test_locking.py b/test/test_locking.py
@@ -44,13 +44,4 @@ def xtest_basics(self):
     def tearDown(self):
         os.remove(self.path)
 
-def test_suite():
-    suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(LockingTest))
-    return suite
-
-if __name__ == '__main__':
-    runner = unittest.TextTestRunner()
-    unittest.main(testRunner=runner)
-
 # vim: set filetype=python ts=4 sw=4 et si
diff --git a/test/test_mailer.py b/test/test_mailer.py
@@ -12,13 +12,4 @@ def testEncoding(self):
             '=?iso8859-1?q?caf=E9?= <ascii@test.com>')
         a('as"ii', 'ascii@test.com', 'iso8859-1', '"as\\"ii" <ascii@test.com>')
 
-def test_suite():
-    suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(EncodingTestCase))
-    return suite
-
-if __name__ == '__main__':
-    runner = unittest.TextTestRunner()
-    unittest.main(testRunner=runner)
-
 # vim: set et sts=4 sw=4 :
diff --git a/test/test_mailgw.py b/test/test_mailgw.py
@@ -3494,17 +3494,4 @@ def testPGPEncryptedSignedMessage(self):
         l = self.db.msg.get(m, 'tx_Source')
         self.assertEqual(l, 'email-sig-openpgp')
 
-def test_suite():
-    suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(MailgwTestCase))
-    if pyme is not None:
-        suite.addTest(unittest.makeSuite(MailgwPGPTestCase))
-    else:
-        print "Skipping PGP tests"
-    return suite
-
-if __name__ == '__main__':
-    runner = unittest.TextTestRunner()
-    unittest.main(testRunner=runner)
-
 # vim: set filetype=python sts=4 sw=4 et si :
diff --git a/test/test_mailsplit.py b/test/test_mailsplit.py
@@ -225,13 +225,4 @@ def testKeepMultipleHyphens(self):
         summary, content = parseContent(body, 1, 0)
         self.assertEqual(body, content)
 
-def test_suite():
-    suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(MailsplitTestCase))
-    return suite
-
-if __name__ == '__main__':
-    runner = unittest.TextTestRunner()
-    unittest.main(testRunner=runner)
-
 # vim: set filetype=python ts=4 sw=4 et si
diff --git a/test/test_memorydb.py b/test/test_memorydb.py
@@ -55,19 +55,5 @@ def setUp(self):
         setupSchema(self.db, 1, self.module)
         self.sessions = self.db.sessions
 
-def test_suite():
-    suite = unittest.TestSuite()
-    print 'Including memorydb tests'
-    suite.addTest(unittest.makeSuite(memorydbDBTest))
-    suite.addTest(unittest.makeSuite(memorydbROTest))
-    suite.addTest(unittest.makeSuite(memorydbSchemaTest))
-    suite.addTest(unittest.makeSuite(memorydbSessionTest))
-    return suite
-
-if __name__ == '__main__':
-    runner = unittest.TextTestRunner()
-    unittest.main(testRunner=runner)
-
-
 # vim: set filetype=python ts=4 sw=4 et si
 
diff --git a/test/test_multipart.py b/test/test_multipart.py
@@ -227,14 +227,4 @@ def testMessageRfc822(self):
                   (None,
                    [('foo.eml', 'message/rfc822', 'Subject: foo\n\nfoo\n')]))
 
-def test_suite():
-    suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(MultipartTestCase))
-    return suite
-
-if __name__ == '__main__':
-    runner = unittest.TextTestRunner()
-    unittest.main(testRunner=runner)
-
-
 # vim: set filetype=python ts=4 sw=4 et si
diff --git a/test/test_mysql.py b/test/test_mysql.py
@@ -131,33 +131,4 @@ def tearDown(self):
         RDBMSTest.tearDown(self)
         mysqlOpener.tearDown(self)
 
-def test_suite():
-    suite = unittest.TestSuite()
-    if not have_backend('mysql'):
-        print "Skipping mysql tests"
-        return suite
-
-    import MySQLdb
-    try:
-        # Check if we can connect to the server.
-        # use db_exists() to make a connection, ignore it's return value
-        mysqlOpener.module.db_exists(config)
-    except (MySQLdb.MySQLError, DatabaseError), msg:
-        print "Skipping mysql tests (%s)"%msg
-    else:
-        print 'Including mysql tests'
-        suite.addTest(unittest.makeSuite(mysqlDBTest))
-        suite.addTest(unittest.makeSuite(mysqlROTest))
-        suite.addTest(unittest.makeSuite(mysqlSchemaTest))
-        suite.addTest(unittest.makeSuite(mysqlClassicInitTest))
-        suite.addTest(unittest.makeSuite(mysqlSessionTest))
-        suite.addTest(unittest.makeSuite(mysqlConcurrencyTest))
-        suite.addTest(unittest.makeSuite(mysqlHTMLItemTest))
-        suite.addTest(unittest.makeSuite(mysqlFilterCacheTest))
-    return suite
-
-if __name__ == '__main__':
-    runner = unittest.TextTestRunner()
-    unittest.main(testRunner=runner)
-
 # vim: set et sts=4 sw=4 :
diff --git a/test/test_postgresql.py b/test/test_postgresql.py
@@ -196,27 +196,4 @@ def tearDown(self):
         RDBMSTest.tearDown(self)
         postgresqlOpener.tearDown(self)
 
-def test_suite():
-    suite = unittest.TestSuite()
-    if not have_backend('postgresql'):
-        print "Skipping postgresql tests"
-        return suite
-
-    # make sure we start with a clean slate
-    if postgresqlOpener.module.db_exists(config):
-        postgresqlOpener.module.db_nuke(config, 1)
-
-    # TODO: Check if we can run postgresql tests
-    print 'Including postgresql tests'
-    suite.addTest(unittest.makeSuite(postgresqlDBTest))
-    suite.addTest(unittest.makeSuite(postgresqlROTest))
-    suite.addTest(unittest.makeSuite(postgresqlSchemaTest))
-    suite.addTest(unittest.makeSuite(postgresqlClassicInitTest))
-    suite.addTest(unittest.makeSuite(postgresqlSessionTest))
-    suite.addTest(unittest.makeSuite(postgresqlConcurrencyTest))
-    suite.addTest(unittest.makeSuite(postgresqlJournalTest))
-    suite.addTest(unittest.makeSuite(postgresqlHTMLItemTest))
-    suite.addTest(unittest.makeSuite(postgresqlFilterCacheTest))
-    return suite
-
 # vim: set et sts=4 sw=4 :
diff --git a/test/test_schema.py b/test/test_schema.py
@@ -72,15 +72,4 @@ def testC_User(self):
         self.assert_(user, 'no class object returned')
         user.setkey("username")
 
-
-def test_suite():
-    suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(SchemaTestCase))
-    return suite
-
-if __name__ == '__main__':
-    runner = unittest.TextTestRunner()
-    unittest.main(testRunner=runner)
-
-
 # vim: set filetype=python sts=4 sw=4 et si :
diff --git a/test/test_security.py b/test/test_security.py
@@ -236,13 +236,4 @@ def testTransitiveSearchPermissions(self):
     def test_password(self):
         roundup.password.test()
 
-def test_suite():
-    suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(PermissionTest))
-    return suite
-
-if __name__ == '__main__':
-    runner = unittest.TextTestRunner()
-    unittest.main(testRunner=runner)
-
 # vim: set filetype=python sts=4 sw=4 et si :
diff --git a/test/test_sqlite.py b/test/test_sqlite.py
@@ -56,24 +56,3 @@ class sqliteFilterCacheTest(sqliteOpener, FilterCacheTest, unittest.TestCase):
 from session_common import RDBMSTest
 class sqliteSessionTest(sqliteOpener, RDBMSTest, unittest.TestCase):
     pass
-
-def test_suite():
-    suite = unittest.TestSuite()
-    from roundup import backends
-    if not have_backend('sqlite'):
-        print 'Skipping sqlite tests'
-        return suite
-    print 'Including sqlite tests'
-    suite.addTest(unittest.makeSuite(sqliteDBTest))
-    suite.addTest(unittest.makeSuite(sqliteROTest))
-    suite.addTest(unittest.makeSuite(sqliteSchemaTest))
-    suite.addTest(unittest.makeSuite(sqliteClassicInitTest))
-    suite.addTest(unittest.makeSuite(sqliteSessionTest))
-    suite.addTest(unittest.makeSuite(sqliteConcurrencyTest))
-    suite.addTest(unittest.makeSuite(sqliteFilterCacheTest))
-    return suite
-
-if __name__ == '__main__':
-    runner = unittest.TextTestRunner()
-    unittest.main(testRunner=runner)
-
diff --git a/test/test_templating.py b/test/test_templating.py
diff --git a/test/test_textfmt.py b/test/test_textfmt.py
diff --git a/test/test_token.py b/test/test_token.py
diff --git a/test/test_userauditor.py b/test/test_userauditor.py
diff --git a/test/test_xmlrpc.py b/test/test_xmlrpc.py

Original file line number	Diff line number	Diff line change
`@@ -24,13 +24,4 @@ def testLoadTemplateInfo(self):`
`24`	`24`	`}`
`25`	`25`	`)`
`26`	`26`
`27`		`-def test_suite():`
`28`		`- suite = unittest.TestSuite()`
`29`		`- suite.addTest(unittest.makeSuite(TemplateInfoTestCase))`
`30`		`- return suite`
`31`		`-`
`32`		`-if __name__ == '__main__':`
`33`		`- runner = unittest.TextTestRunner()`
`34`		`- unittest.main(testRunner=runner)`
`35`		`-`
`36`	`27`	`# vim: set et sts=4 sw=4 :`