comparison 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
comparison
equal deleted inserted replaced
5032:fc0f7655411b 5033:63c79c0992ae
36 self.nuke_database() 36 self.nuke_database()
37 37
38 def nuke_database(self): 38 def nuke_database(self):
39 self.module.db_nuke(config) 39 self.module.db_nuke(config)
40 40
41 class mysqlDBTest(mysqlOpener, DBTest): 41
42 class mysqlDBTest(mysqlOpener, DBTest, unittest.TestCase):
42 def setUp(self): 43 def setUp(self):
43 mysqlOpener.setUp(self) 44 mysqlOpener.setUp(self)
44 DBTest.setUp(self) 45 DBTest.setUp(self)
45 46
46 class mysqlROTest(mysqlOpener, ROTest): 47
48 class mysqlROTest(mysqlOpener, ROTest, unittest.TestCase):
47 def setUp(self): 49 def setUp(self):
48 mysqlOpener.setUp(self) 50 mysqlOpener.setUp(self)
49 ROTest.setUp(self) 51 ROTest.setUp(self)
50 52
51 class mysqlSchemaTest(mysqlOpener, SchemaTest): 53
54 class mysqlSchemaTest(mysqlOpener, SchemaTest, unittest.TestCase):
52 def setUp(self): 55 def setUp(self):
53 mysqlOpener.setUp(self) 56 mysqlOpener.setUp(self)
54 SchemaTest.setUp(self) 57 SchemaTest.setUp(self)
55 58
56 class mysqlClassicInitTest(mysqlOpener, ClassicInitTest): 59
60 class mysqlClassicInitTest(mysqlOpener, ClassicInitTest, unittest.TestCase):
57 backend = 'mysql' 61 backend = 'mysql'
58 def setUp(self): 62 def setUp(self):
59 mysqlOpener.setUp(self) 63 mysqlOpener.setUp(self)
60 ClassicInitTest.setUp(self) 64 ClassicInitTest.setUp(self)
61 def tearDown(self): 65 def tearDown(self):
62 ClassicInitTest.tearDown(self) 66 ClassicInitTest.tearDown(self)
63 self.nuke_database() 67 self.nuke_database()
64 68
65 class mysqlConcurrencyTest(mysqlOpener, ConcurrentDBTest): 69
70 class mysqlConcurrencyTest(mysqlOpener, ConcurrentDBTest, unittest.TestCase):
66 backend = 'mysql' 71 backend = 'mysql'
67 def setUp(self): 72 def setUp(self):
68 mysqlOpener.setUp(self) 73 mysqlOpener.setUp(self)
69 ConcurrentDBTest.setUp(self) 74 ConcurrentDBTest.setUp(self)
70 def tearDown(self): 75 def tearDown(self):
71 ConcurrentDBTest.tearDown(self) 76 ConcurrentDBTest.tearDown(self)
72 self.nuke_database() 77 self.nuke_database()
73 78
74 class mysqlHTMLItemTest(mysqlOpener, HTMLItemTest): 79
80 class mysqlHTMLItemTest(mysqlOpener, HTMLItemTest, unittest.TestCase):
75 backend = 'mysql' 81 backend = 'mysql'
76 def setUp(self): 82 def setUp(self):
77 mysqlOpener.setUp(self) 83 mysqlOpener.setUp(self)
78 HTMLItemTest.setUp(self) 84 HTMLItemTest.setUp(self)
79 def tearDown(self): 85 def tearDown(self):
80 HTMLItemTest.tearDown(self) 86 HTMLItemTest.tearDown(self)
81 self.nuke_database() 87 self.nuke_database()
82 88
83 class mysqlFilterCacheTest(mysqlOpener, FilterCacheTest): 89
90 class mysqlFilterCacheTest(mysqlOpener, FilterCacheTest, unittest.TestCase):
84 backend = 'mysql' 91 backend = 'mysql'
85 def setUp(self): 92 def setUp(self):
86 mysqlOpener.setUp(self) 93 mysqlOpener.setUp(self)
87 FilterCacheTest.setUp(self) 94 FilterCacheTest.setUp(self)
88 def tearDown(self): 95 def tearDown(self):
89 FilterCacheTest.tearDown(self) 96 FilterCacheTest.tearDown(self)
90 self.nuke_database() 97 self.nuke_database()
91 98
99
92 from session_common import RDBMSTest 100 from session_common import RDBMSTest
93 class mysqlSessionTest(mysqlOpener, RDBMSTest): 101 class mysqlSessionTest(mysqlOpener, RDBMSTest, unittest.TestCase):
94 def setUp(self): 102 def setUp(self):
95 mysqlOpener.setUp(self) 103 mysqlOpener.setUp(self)
96 RDBMSTest.setUp(self) 104 RDBMSTest.setUp(self)
97 def tearDown(self): 105 def tearDown(self):
98 RDBMSTest.tearDown(self) 106 RDBMSTest.tearDown(self)

Roundup Issue Tracker: http://roundup-tracker.org/