Mercurial > p > roundup > code
diff test/test_mysql.py @ 5033:63c79c0992ae
Update tests to work with py.test
py.test searches for any class that looks like a TestCase in the test
directory and tries to run them as tests. Some of the classes that
inherit TestCase are not meant to be run and are only intended to be
"helper classes". Only the tests of the classes that inherit the "helper
classes" should be run. If we convert these "helper classes" to be
"mixins" py.test should not pick them up.
| author | John Kristensen <john@jerrykan.com> |
|---|---|
| date | Thu, 20 Aug 2015 14:44:49 +1000 |
| parents | f6e76a03b502 |
| children | 380d8d8b30a3 |
line wrap: on
line diff
--- a/test/test_mysql.py Tue Jan 12 04:33:53 2016 +0300 +++ b/test/test_mysql.py Thu Aug 20 14:44:49 2015 +1000 @@ -38,22 +38,26 @@ def nuke_database(self): self.module.db_nuke(config) -class mysqlDBTest(mysqlOpener, DBTest): + +class mysqlDBTest(mysqlOpener, DBTest, unittest.TestCase): def setUp(self): mysqlOpener.setUp(self) DBTest.setUp(self) -class mysqlROTest(mysqlOpener, ROTest): + +class mysqlROTest(mysqlOpener, ROTest, unittest.TestCase): def setUp(self): mysqlOpener.setUp(self) ROTest.setUp(self) -class mysqlSchemaTest(mysqlOpener, SchemaTest): + +class mysqlSchemaTest(mysqlOpener, SchemaTest, unittest.TestCase): def setUp(self): mysqlOpener.setUp(self) SchemaTest.setUp(self) -class mysqlClassicInitTest(mysqlOpener, ClassicInitTest): + +class mysqlClassicInitTest(mysqlOpener, ClassicInitTest, unittest.TestCase): backend = 'mysql' def setUp(self): mysqlOpener.setUp(self) @@ -62,7 +66,8 @@ ClassicInitTest.tearDown(self) self.nuke_database() -class mysqlConcurrencyTest(mysqlOpener, ConcurrentDBTest): + +class mysqlConcurrencyTest(mysqlOpener, ConcurrentDBTest, unittest.TestCase): backend = 'mysql' def setUp(self): mysqlOpener.setUp(self) @@ -71,7 +76,8 @@ ConcurrentDBTest.tearDown(self) self.nuke_database() -class mysqlHTMLItemTest(mysqlOpener, HTMLItemTest): + +class mysqlHTMLItemTest(mysqlOpener, HTMLItemTest, unittest.TestCase): backend = 'mysql' def setUp(self): mysqlOpener.setUp(self) @@ -80,7 +86,8 @@ HTMLItemTest.tearDown(self) self.nuke_database() -class mysqlFilterCacheTest(mysqlOpener, FilterCacheTest): + +class mysqlFilterCacheTest(mysqlOpener, FilterCacheTest, unittest.TestCase): backend = 'mysql' def setUp(self): mysqlOpener.setUp(self) @@ -89,8 +96,9 @@ FilterCacheTest.tearDown(self) self.nuke_database() + from session_common import RDBMSTest -class mysqlSessionTest(mysqlOpener, RDBMSTest): +class mysqlSessionTest(mysqlOpener, RDBMSTest, unittest.TestCase): def setUp(self): mysqlOpener.setUp(self) RDBMSTest.setUp(self)