From a82e3cadf9f94cc786852a71b8e39cc36a5cf3ef Mon Sep 17 00:00:00 2001 From: John Kristensen Date: Fri, 21 Aug 2015 13:08:02 +1000 Subject: [PATCH 5/5] Remove unneeded TestSuite code from tests The TestSuite code is no longer needed now that we are using py.test which can automatically discover tests --- test/test_actions.py | 15 --------------- test/test_anydbm.py | 16 ---------------- test/test_cgi.py | 14 -------------- test/test_dates.py | 17 ----------------- test/test_hyperdbvals.py | 8 -------- test/test_indexer.py | 42 ------------------------------------------ test/test_init.py | 9 --------- test/test_jinja2.py | 19 +++---------------- test/test_locking.py | 9 --------- test/test_mailer.py | 9 --------- test/test_mailgw.py | 13 ------------- test/test_mailsplit.py | 9 --------- test/test_memorydb.py | 14 -------------- test/test_multipart.py | 10 ---------- test/test_mysql.py | 29 ----------------------------- test/test_postgresql.py | 23 ----------------------- test/test_schema.py | 11 ----------- test/test_security.py | 9 --------- test/test_sqlite.py | 21 --------------------- test/test_templating.py | 12 ------------ test/test_textfmt.py | 5 ----- test/test_token.py | 9 --------- test/test_tsearch2.py | 19 ------------------- test/test_userauditor.py | 9 --------- test/test_xmlrpc.py | 13 ------------- 25 files changed, 3 insertions(+), 361 deletions(-) diff --git a/test/test_actions.py b/test/test_actions.py index 61f32fc7a0..049dd3482a 100644 --- a/test/test_actions.py +++ b/test/test_actions.py @@ -341,19 +341,4 @@ class EditItemActionTestCase(ActionTestCase): 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 index b817f170a2..0ad773d967 100644 --- a/test/test_anydbm.py +++ b/test/test_anydbm.py @@ -52,20 +52,4 @@ from session_common import DBMTest 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 index 24a9398767..ae9a788896 100644 --- a/test/test_cgi.py +++ b/test/test_cgi.py @@ -979,18 +979,4 @@ class FormTestCase(unittest.TestCase): 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 index e29fe93595..703a64cc42 100644 --- a/test/test_dates.py +++ b/test/test_dates.py @@ -508,21 +508,4 @@ class RangeTestCase(unittest.TestCase): 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 index 8e6151346f..991d62464b 100644 --- a/test/test_hyperdbvals.py +++ b/test/test_hyperdbvals.py @@ -129,12 +129,4 @@ class RawToHyperdbTest(unittest.TestCase): 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 index 378d33276e..0180d27484 100644 --- a/test/test_indexer.py +++ b/test/test_indexer.py @@ -201,46 +201,4 @@ class mysqlIndexerTest(mysqlOpener, RDBMSIndexerTest, IndexerTest): 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 index d16b1b5590..2c37aba87e 100644 --- a/test/test_init.py +++ b/test/test_init.py @@ -24,13 +24,4 @@ class TemplateInfoTestCase(unittest.TestCase): } ) -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 index e690efe45a..47e2ad0d1d 100644 --- a/test/test_jinja2.py +++ b/test/test_jinja2.py @@ -31,25 +31,12 @@ class Jinja2Test(object): 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. - suite.addTest(unittest.makeSuite(anydbmJinja2Test)) - - return suite - -# Other roundup testcases do have a def main thing in there, -# 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 index b4386f0bdf..444f3def79 100644 --- a/test/test_locking.py +++ b/test/test_locking.py @@ -44,13 +44,4 @@ class LockingTest(unittest.TestCase): 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 index ea84f65ca5..0eee1c7951 100644 --- a/test/test_mailer.py +++ b/test/test_mailer.py @@ -12,13 +12,4 @@ class EncodingTestCase(unittest.TestCase): '=?iso8859-1?q?caf=E9?= ') a('as"ii', 'ascii@test.com', 'iso8859-1', '"as\\"ii" ') -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 index c847335efe..5ff29b3320 100644 --- a/test/test_mailgw.py +++ b/test/test_mailgw.py @@ -3494,17 +3494,4 @@ zGhS06FLl3V1xx6gBlpqQHjut3efrAGpXGBVpnTJMOcgYAk= 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 index eb0d9e817f..dc18bf95d9 100644 --- a/test/test_mailsplit.py +++ b/test/test_mailsplit.py @@ -225,13 +225,4 @@ Testing, testing.''' 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 index 01da141f6f..6eaf14c71f 100644 --- a/test/test_memorydb.py +++ b/test/test_memorydb.py @@ -55,19 +55,5 @@ class memorydbSessionTest(memorydbOpener, DBMTest, unittest.TestCase): 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 index 704e9f15ac..e868e17b95 100644 --- a/test/test_multipart.py +++ b/test/test_multipart.py @@ -227,14 +227,4 @@ multipart/mixed (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 index 36119141c4..3ae1ebeea4 100644 --- a/test/test_mysql.py +++ b/test/test_mysql.py @@ -131,33 +131,4 @@ class mysqlSessionTest(mysqlOpener, RDBMSTest, unittest.TestCase): 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 index 4dbf4a3312..e4a5d26a88 100644 --- a/test/test_postgresql.py +++ b/test/test_postgresql.py @@ -196,27 +196,4 @@ class postgresqlSessionTest(postgresqlOpener, RDBMSTest, unittest.TestCase): 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 index 2061465dbc..e53b08a64c 100644 --- a/test/test_schema.py +++ b/test/test_schema.py @@ -72,15 +72,4 @@ class SchemaTestCase(unittest.TestCase): 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 index 719d834d43..57a67f1785 100644 --- a/test/test_security.py +++ b/test/test_security.py @@ -236,13 +236,4 @@ class PermissionTest(MyTestCase, unittest.TestCase): 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 index f4a07a91bc..cb114651f8 100644 --- 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 index b1b65711a5..31669ea430 100644 --- a/test/test_templating.py +++ b/test/test_templating.py @@ -349,16 +349,4 @@ class RoundupPageTemplate(PageTemplate.PageTemplate): def __repr__(self): ''' - -def test_suite(): - suite = unittest.TestSuite() - suite.addTest(unittest.makeSuite(HTMLDatabaseTestCase)) - suite.addTest(unittest.makeSuite(FunctionsTestCase)) - suite.addTest(unittest.makeSuite(HTMLClassTestCase)) - return suite - -if __name__ == '__main__': - runner = unittest.TextTestRunner() - unittest.main(testRunner=runner) - # vim: set et sts=4 sw=4 : diff --git a/test/test_textfmt.py b/test/test_textfmt.py index 9dbef97678..abf76c9fc6 100644 --- a/test/test_textfmt.py +++ b/test/test_textfmt.py @@ -10,8 +10,3 @@ sit amet, consectetuer adipiscing elit.''' self.assertEquals(wrap(lorem, 20), wrapped) - -def test_suite(): - suite = unittest.TestSuite() - suite.addTest(unittest.makeSuite(WrapTestCase)) - return suite diff --git a/test/test_token.py b/test/test_token.py index 30caf91d52..f0d88bce6e 100644 --- a/test/test_token.py +++ b/test/test_token.py @@ -47,13 +47,4 @@ class TokenTestCase(unittest.TestCase): self.assertRaises(ValueError, token_split, '"hello world') self.assertRaises(ValueError, token_split, "Roch'e Compaan") -def test_suite(): - suite = unittest.TestSuite() - suite.addTest(unittest.makeSuite(TokenTestCase)) - 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_tsearch2.py b/test/test_tsearch2.py index ff7265977b..5d14e12def 100644 --- a/test/test_tsearch2.py +++ b/test/test_tsearch2.py @@ -121,23 +121,4 @@ class tsearch2SessionTest(tsearch2Opener, RDBMSTest, unittest.TestCase): RDBMSTest.tearDown(self) tsearch2Opener.tearDown(self) -def test_suite(): - suite = unittest.TestSuite() - if not have_backend('tsearch2'): - print "Skipping tsearch2 tests" - return suite - - # make sure we start with a clean slate - if tsearch2Opener.module.db_exists(config): - tsearch2Opener.module.db_nuke(config, 1) - - # TODO: Check if we can run postgresql tests - print 'Including tsearch2 tests' - suite.addTest(unittest.makeSuite(tsearch2DBTest)) - suite.addTest(unittest.makeSuite(tsearch2ROTest)) - suite.addTest(unittest.makeSuite(tsearch2SchemaTest)) - suite.addTest(unittest.makeSuite(tsearch2ClassicInitTest)) - suite.addTest(unittest.makeSuite(tsearch2SessionTest)) - return suite - # vim: set et sts=4 sw=4 : diff --git a/test/test_userauditor.py b/test/test_userauditor.py index 2787329d06..a95bc45740 100644 --- a/test/test_userauditor.py +++ b/test/test_userauditor.py @@ -104,13 +104,4 @@ class UserAuditorTest(unittest.TestCase): # check for all-whitespace (treat as no role) self.db.user.set(userid, roles=' ') -def test_suite(): - suite = unittest.TestSuite() - suite.addTest(unittest.makeSuite(UserAuditorTest)) - return suite - -if __name__ == '__main__': - runner = unittest.TextTestRunner() - unittest.main(testRunner=runner) - # vim: filetype=python sts=4 sw=4 et si diff --git a/test/test_xmlrpc.py b/test/test_xmlrpc.py index 253a7ab3f0..dba90c9aa8 100644 --- a/test/test_xmlrpc.py +++ b/test/test_xmlrpc.py @@ -268,16 +268,3 @@ class sqliteXmlrpcTest(XmlrpcTest, unittest.TestCase): @skip_postgresql class postgresqlXmlrpcTest(XmlrpcTest, unittest.TestCase): backend = 'postgresql' - - -def test_suite(): - suite = unittest.TestSuite() - suite.addTest(unittest.makeSuite(anydbmXmlrpcTest)) - suite.addTest(unittest.makeSuite(mysqlXmlrpcTest)) - suite.addTest(unittest.makeSuite(sqilteXmlrpcTest)) - suite.addTest(unittest.makeSuite(postgresqlXmlrpcTest)) - return suite - -if __name__ == '__main__': - runner = unittest.TextTestRunner() - unittest.main(testRunner=runner) -- 2.5.0