Browse Source

Ensure all test fixtures in oslo_db.tests are private

Downstream projects have started using the fixtures inside
of oslo_db.tests in response to the deprecations added in
I0163e637ffef6d45d2573ebe29b5438911d01fce.   This was not
the intent of these deprecations, so add messsaging to
this effect and ensure fixtures used by the test suite
itself are noted as private.

Change-Id: I3afe0a440a3ab66904aaecf556948df9d4e16b8e
Mike Bayer 1 year ago
parent
commit
39c52cc7c9

+ 6
- 2
oslo_db/sqlalchemy/test_base.py View File

@@ -34,7 +34,9 @@ from oslo_db.sqlalchemy import provision
34 34
 from oslo_db.sqlalchemy import session
35 35
 
36 36
 
37
-@debtcollector.removals.removed_class("DbFixture")
37
+@debtcollector.removals.removed_class(
38
+    "DbFixture",
39
+    message="Please use oslo_db.sqlalchemy.test_fixtures directly")
38 40
 class DbFixture(fixtures.Fixture):
39 41
     """Basic database fixture.
40 42
 
@@ -89,7 +91,9 @@ class DbFixture(fixtures.Fixture):
89 91
         self.addCleanup(self.test.enginefacade.dispose_global)
90 92
 
91 93
 
92
-@debtcollector.removals.removed_class("DbTestCase")
94
+@debtcollector.removals.removed_class(
95
+    "DbTestCase",
96
+    message="Please use oslo_db.sqlalchemy.test_fixtures directly")
93 97
 class DbTestCase(test_base.BaseTestCase):
94 98
     """Base class for testing of DB code.
95 99
 

+ 35
- 0
oslo_db/tests/sqlalchemy/base.py View File

@@ -13,6 +13,8 @@
13 13
 #    License for the specific language governing permissions and limitations
14 14
 #    under the License.
15 15
 
16
+import debtcollector
17
+
16 18
 from oslo_db.sqlalchemy import enginefacade
17 19
 from oslo_db.sqlalchemy.test_base import backend_specific  # noqa
18 20
 from oslo_db.sqlalchemy import test_fixtures as db_fixtures
@@ -26,6 +28,10 @@ class Context(object):
26 28
 context = Context()
27 29
 
28 30
 
31
+@debtcollector.removals.removed_class(
32
+    "DbTestCase",
33
+    message="Do not import from oslo_db.tests!  "
34
+            "Please use oslo_db.sqlalchemy.test_fixtures directly")
29 35
 class DbTestCase(db_fixtures.OpportunisticDBTestMixin, test_base.BaseTestCase):
30 36
 
31 37
     def setUp(self):
@@ -35,9 +41,38 @@ class DbTestCase(db_fixtures.OpportunisticDBTestMixin, test_base.BaseTestCase):
35 41
         self.sessionmaker = enginefacade.writer.get_sessionmaker()
36 42
 
37 43
 
44
+@debtcollector.removals.removed_class(
45
+    "MySQLOpportunisticTestCase",
46
+    message="Do not import from oslo_db.tests!  "
47
+            "Please use oslo_db.sqlalchemy.test_fixtures directly")
38 48
 class MySQLOpportunisticTestCase(DbTestCase):
39 49
     FIXTURE = db_fixtures.MySQLOpportunisticFixture
40 50
 
41 51
 
52
+@debtcollector.removals.removed_class(
53
+    "PostgreSQLOpportunisticTestCase",
54
+    message="Do not import from oslo_db.tests!  "
55
+            "Please use oslo_db.sqlalchemy.test_fixtures directly")
42 56
 class PostgreSQLOpportunisticTestCase(DbTestCase):
43 57
     FIXTURE = db_fixtures.PostgresqlOpportunisticFixture
58
+
59
+
60
+# NOTE (zzzeek) These test classes are **private to oslo.db**.  Please
61
+# make use of oslo_db.sqlalchemy.test_fixtures directly.
62
+
63
+class _DbTestCase(
64
+        db_fixtures.OpportunisticDBTestMixin, test_base.BaseTestCase):
65
+
66
+    def setUp(self):
67
+        super(_DbTestCase, self).setUp()
68
+
69
+        self.engine = enginefacade.writer.get_engine()
70
+        self.sessionmaker = enginefacade.writer.get_sessionmaker()
71
+
72
+
73
+class _MySQLOpportunisticTestCase(_DbTestCase):
74
+    FIXTURE = db_fixtures.MySQLOpportunisticFixture
75
+
76
+
77
+class _PostgreSQLOpportunisticTestCase(_DbTestCase):
78
+    FIXTURE = db_fixtures.PostgresqlOpportunisticFixture

+ 2
- 2
oslo_db/tests/sqlalchemy/test_async_eventlet.py View File

@@ -118,10 +118,10 @@ class EventletTestMixin(object):
118 118
 # ie: This file performs no tests by default.
119 119
 
120 120
 class MySQLEventletTestCase(EventletTestMixin,
121
-                            test_base.MySQLOpportunisticTestCase):
121
+                            test_base._MySQLOpportunisticTestCase):
122 122
     pass
123 123
 
124 124
 
125 125
 class PostgreSQLEventletTestCase(EventletTestMixin,
126
-                                 test_base.PostgreSQLOpportunisticTestCase):
126
+                                 test_base._PostgreSQLOpportunisticTestCase):
127 127
     pass

+ 5
- 5
oslo_db/tests/sqlalchemy/test_enginefacade.py View File

@@ -1335,7 +1335,7 @@ class AsyncReaderWSlaveMockFacadeTest(MockFacadeTest):
1335 1335
     slave_uri = 'some_slave_connection'
1336 1336
 
1337 1337
 
1338
-class LegacyIntegrationtest(test_base.DbTestCase):
1338
+class LegacyIntegrationtest(test_base._DbTestCase):
1339 1339
 
1340 1340
     def test_legacy_integration(self):
1341 1341
         legacy_facade = enginefacade.get_legacy_facade()
@@ -1393,7 +1393,7 @@ class LegacyIntegrationtest(test_base.DbTestCase):
1393 1393
         )
1394 1394
 
1395 1395
 
1396
-class ThreadingTest(test_base.DbTestCase):
1396
+class ThreadingTest(test_base._DbTestCase):
1397 1397
     """Test copy/pickle on new threads using real connections and sessions."""
1398 1398
 
1399 1399
     def _assert_ctx_connection(self, context, connection):
@@ -1586,7 +1586,7 @@ class ThreadingTest(test_base.DbTestCase):
1586 1586
                 assert session is not session2
1587 1587
 
1588 1588
 
1589
-class LiveFacadeTest(test_base.DbTestCase):
1589
+class LiveFacadeTest(test_base._DbTestCase):
1590 1590
     """test using live SQL with test-provisioned databases.
1591 1591
 
1592 1592
     Several of these tests require that multiple transactions run
@@ -2127,12 +2127,12 @@ class LiveFacadeTest(test_base.DbTestCase):
2127 2127
 
2128 2128
 
2129 2129
 class MySQLLiveFacadeTest(
2130
-        test_base.MySQLOpportunisticTestCase, LiveFacadeTest):
2130
+        test_base._MySQLOpportunisticTestCase, LiveFacadeTest):
2131 2131
     pass
2132 2132
 
2133 2133
 
2134 2134
 class PGLiveFacadeTest(
2135
-        test_base.PostgreSQLOpportunisticTestCase, LiveFacadeTest):
2135
+        test_base._PostgreSQLOpportunisticTestCase, LiveFacadeTest):
2136 2136
     pass
2137 2137
 
2138 2138
 

+ 15
- 15
oslo_db/tests/sqlalchemy/test_exc_filters.py View File

@@ -251,7 +251,7 @@ class TestFallthroughsAndNonDBAPI(TestsExceptionFilter):
251 251
 
252 252
 class TestNonExistentConstraint(
253 253
         _SQLAExceptionMatcher,
254
-        test_base.DbTestCase):
254
+        test_base._DbTestCase):
255 255
 
256 256
     def setUp(self):
257 257
         super(TestNonExistentConstraint, self).setUp()
@@ -269,7 +269,7 @@ class TestNonExistentConstraint(
269 269
 
270 270
 class TestNonExistentConstraintPostgreSQL(
271 271
         TestNonExistentConstraint,
272
-        test_base.PostgreSQLOpportunisticTestCase):
272
+        test_base._PostgreSQLOpportunisticTestCase):
273 273
 
274 274
     def test_raise(self):
275 275
         matched = self.assertRaises(
@@ -293,7 +293,7 @@ class TestNonExistentConstraintPostgreSQL(
293 293
 
294 294
 class TestNonExistentConstraintMySQL(
295 295
         TestNonExistentConstraint,
296
-        test_base.MySQLOpportunisticTestCase):
296
+        test_base._MySQLOpportunisticTestCase):
297 297
 
298 298
     def test_raise(self):
299 299
         matched = self.assertRaises(
@@ -317,7 +317,7 @@ class TestNonExistentConstraintMySQL(
317 317
 
318 318
 class TestNonExistentTable(
319 319
         _SQLAExceptionMatcher,
320
-        test_base.DbTestCase):
320
+        test_base._DbTestCase):
321 321
 
322 322
     def setUp(self):
323 323
         super(TestNonExistentTable, self).setUp()
@@ -348,7 +348,7 @@ class TestNonExistentTable(
348 348
 
349 349
 class TestNonExistentTablePostgreSQL(
350 350
         TestNonExistentTable,
351
-        test_base.PostgreSQLOpportunisticTestCase):
351
+        test_base._PostgreSQLOpportunisticTestCase):
352 352
 
353 353
     def test_raise(self):
354 354
         matched = self.assertRaises(
@@ -367,7 +367,7 @@ class TestNonExistentTablePostgreSQL(
367 367
 
368 368
 class TestNonExistentTableMySQL(
369 369
         TestNonExistentTable,
370
-        test_base.MySQLOpportunisticTestCase):
370
+        test_base._MySQLOpportunisticTestCase):
371 371
 
372 372
     def test_raise(self):
373 373
         matched = self.assertRaises(
@@ -385,7 +385,7 @@ class TestNonExistentTableMySQL(
385 385
 
386 386
 class TestNonExistentDatabase(
387 387
         _SQLAExceptionMatcher,
388
-        test_base.DbTestCase):
388
+        test_base._DbTestCase):
389 389
 
390 390
     def setUp(self):
391 391
         super(TestNonExistentDatabase, self).setUp()
@@ -411,7 +411,7 @@ class TestNonExistentDatabase(
411 411
 
412 412
 class TestNonExistentDatabaseMySQL(
413 413
         TestNonExistentDatabase,
414
-        test_base.MySQLOpportunisticTestCase):
414
+        test_base._MySQLOpportunisticTestCase):
415 415
 
416 416
     def test_raise(self):
417 417
         matched = self.assertRaises(
@@ -430,7 +430,7 @@ class TestNonExistentDatabaseMySQL(
430 430
 
431 431
 class TestNonExistentDatabasePostgreSQL(
432 432
         TestNonExistentDatabase,
433
-        test_base.PostgreSQLOpportunisticTestCase):
433
+        test_base._PostgreSQLOpportunisticTestCase):
434 434
 
435 435
     def test_raise(self):
436 436
         matched = self.assertRaises(
@@ -446,7 +446,7 @@ class TestNonExistentDatabasePostgreSQL(
446 446
         )
447 447
 
448 448
 
449
-class TestReferenceErrorSQLite(_SQLAExceptionMatcher, test_base.DbTestCase):
449
+class TestReferenceErrorSQLite(_SQLAExceptionMatcher, test_base._DbTestCase):
450 450
 
451 451
     def setUp(self):
452 452
         super(TestReferenceErrorSQLite, self).setUp()
@@ -520,7 +520,7 @@ class TestReferenceErrorSQLite(_SQLAExceptionMatcher, test_base.DbTestCase):
520 520
 
521 521
 
522 522
 class TestReferenceErrorPostgreSQL(TestReferenceErrorSQLite,
523
-                                   test_base.PostgreSQLOpportunisticTestCase):
523
+                                   test_base._PostgreSQLOpportunisticTestCase):
524 524
     def test_raise(self):
525 525
         params = {'id': 1, 'foo_id': 2}
526 526
         matched = self.assertRaises(
@@ -571,7 +571,7 @@ class TestReferenceErrorPostgreSQL(TestReferenceErrorSQLite,
571 571
 
572 572
 
573 573
 class TestReferenceErrorMySQL(TestReferenceErrorSQLite,
574
-                              test_base.MySQLOpportunisticTestCase):
574
+                              test_base._MySQLOpportunisticTestCase):
575 575
     def test_raise(self):
576 576
         matched = self.assertRaises(
577 577
             exception.DBReferenceError,
@@ -632,7 +632,7 @@ class TestReferenceErrorMySQL(TestReferenceErrorSQLite,
632 632
         self.assertEqual("resource_foo", matched.key_table)
633 633
 
634 634
 
635
-class TestExceptionCauseMySQLSavepoint(test_base.MySQLOpportunisticTestCase):
635
+class TestExceptionCauseMySQLSavepoint(test_base._MySQLOpportunisticTestCase):
636 636
     def setUp(self):
637 637
         super(TestExceptionCauseMySQLSavepoint, self).setUp()
638 638
 
@@ -762,7 +762,7 @@ class TestExceptionCauseMySQLSavepoint(test_base.MySQLOpportunisticTestCase):
762 762
             assert False, "no exception raised"
763 763
 
764 764
 
765
-class TestDBDataErrorSQLite(_SQLAExceptionMatcher, test_base.DbTestCase):
765
+class TestDBDataErrorSQLite(_SQLAExceptionMatcher, test_base._DbTestCase):
766 766
 
767 767
     def setUp(self):
768 768
         super(TestDBDataErrorSQLite, self).setUp()
@@ -1084,7 +1084,7 @@ class TestDataError(TestsExceptionFilter):
1084 1084
                                 self.DataError)
1085 1085
 
1086 1086
 
1087
-class IntegrationTest(test_base.DbTestCase):
1087
+class IntegrationTest(test_base._DbTestCase):
1088 1088
     """Test an actual error-raising round trips against the database."""
1089 1089
 
1090 1090
     def setUp(self):

+ 1
- 1
oslo_db/tests/sqlalchemy/test_migration_common.py View File

@@ -28,7 +28,7 @@ from oslo_db.tests.sqlalchemy import base as test_base
28 28
 from oslo_db.tests import utils as test_utils
29 29
 
30 30
 
31
-class TestMigrationCommon(test_base.DbTestCase):
31
+class TestMigrationCommon(test_base._DbTestCase):
32 32
     def setUp(self):
33 33
         super(TestMigrationCommon, self).setUp()
34 34
 

+ 6
- 6
oslo_db/tests/sqlalchemy/test_migrations.py View File

@@ -180,7 +180,7 @@ class TestWalkVersions(test.BaseTestCase, migrate.WalkVersionsMixin):
180 180
         self.assertEqual(upgraded, self.migrate_up.call_args_list)
181 181
 
182 182
 
183
-class ModelsMigrationSyncMixin(test_base.DbTestCase):
183
+class ModelsMigrationSyncMixin(test_base._DbTestCase):
184 184
 
185 185
     def setUp(self):
186 186
         super(ModelsMigrationSyncMixin, self).setUp()
@@ -359,7 +359,7 @@ class ModelsMigrationSyncMixin(test_base.DbTestCase):
359 359
 
360 360
 class ModelsMigrationsSyncMysql(ModelsMigrationSyncMixin,
361 361
                                 migrate.ModelsMigrationsSync,
362
-                                test_base.MySQLOpportunisticTestCase):
362
+                                test_base._MySQLOpportunisticTestCase):
363 363
 
364 364
     def test_models_not_sync(self):
365 365
         self._test_models_not_sync()
@@ -370,7 +370,7 @@ class ModelsMigrationsSyncMysql(ModelsMigrationSyncMixin,
370 370
 
371 371
 class ModelsMigrationsSyncPsql(ModelsMigrationSyncMixin,
372 372
                                migrate.ModelsMigrationsSync,
373
-                               test_base.PostgreSQLOpportunisticTestCase):
373
+                               test_base._PostgreSQLOpportunisticTestCase):
374 374
 
375 375
     def test_models_not_sync(self):
376 376
         self._test_models_not_sync()
@@ -379,7 +379,7 @@ class ModelsMigrationsSyncPsql(ModelsMigrationSyncMixin,
379 379
         self._test_models_not_sync_filtered()
380 380
 
381 381
 
382
-class TestOldCheckForeignKeys(test_base.DbTestCase):
382
+class TestOldCheckForeignKeys(test_base._DbTestCase):
383 383
     def setUp(self):
384 384
         super(TestOldCheckForeignKeys, self).setUp()
385 385
 
@@ -557,10 +557,10 @@ class TestOldCheckForeignKeys(test_base.DbTestCase):
557 557
 
558 558
 
559 559
 class PGTestOldCheckForeignKeys(
560
-        TestOldCheckForeignKeys, test_base.PostgreSQLOpportunisticTestCase):
560
+        TestOldCheckForeignKeys, test_base._PostgreSQLOpportunisticTestCase):
561 561
     pass
562 562
 
563 563
 
564 564
 class MySQLTestOldCheckForeignKeys(
565
-        TestOldCheckForeignKeys, test_base.MySQLOpportunisticTestCase):
565
+        TestOldCheckForeignKeys, test_base._MySQLOpportunisticTestCase):
566 566
     pass

+ 2
- 2
oslo_db/tests/sqlalchemy/test_models.py View File

@@ -30,7 +30,7 @@ from oslo_db.tests.sqlalchemy import base as test_base
30 30
 BASE = declarative_base()
31 31
 
32 32
 
33
-class ModelBaseTest(test_base.DbTestCase):
33
+class ModelBaseTest(test_base._DbTestCase):
34 34
     def setUp(self):
35 35
         super(ModelBaseTest, self).setUp()
36 36
         self.mb = models.ModelBase()
@@ -191,7 +191,7 @@ class SoftDeletedModel(BASE, models.ModelBase, models.SoftDeleteMixin):
191 191
     smth = Column('smth', String(255))
192 192
 
193 193
 
194
-class SoftDeleteMixinTest(test_base.DbTestCase):
194
+class SoftDeleteMixinTest(test_base._DbTestCase):
195 195
     def setUp(self):
196 196
         super(SoftDeleteMixinTest, self).setUp()
197 197
 

+ 3
- 3
oslo_db/tests/sqlalchemy/test_provision.py View File

@@ -27,7 +27,7 @@ from oslo_db.sqlalchemy import utils
27 27
 from oslo_db.tests.sqlalchemy import base as test_base
28 28
 
29 29
 
30
-class DropAllObjectsTest(test_base.DbTestCase):
30
+class DropAllObjectsTest(test_base._DbTestCase):
31 31
 
32 32
     def setUp(self):
33 33
         super(DropAllObjectsTest, self).setUp()
@@ -138,12 +138,12 @@ class BackendNotAvailableTest(oslo_test_base.BaseTestCase):
138 138
 
139 139
 
140 140
 class MySQLDropAllObjectsTest(
141
-        DropAllObjectsTest, test_base.MySQLOpportunisticTestCase):
141
+        DropAllObjectsTest, test_base._MySQLOpportunisticTestCase):
142 142
     pass
143 143
 
144 144
 
145 145
 class PostgreSQLDropAllObjectsTest(
146
-        DropAllObjectsTest, test_base.PostgreSQLOpportunisticTestCase):
146
+        DropAllObjectsTest, test_base._PostgreSQLOpportunisticTestCase):
147 147
     pass
148 148
 
149 149
 

+ 7
- 7
oslo_db/tests/sqlalchemy/test_sqlalchemy.py View File

@@ -52,7 +52,7 @@ class RegexpTable(BASE, models.ModelBase):
52 52
     bar = Column(String(255))
53 53
 
54 54
 
55
-class RegexpFilterTestCase(test_base.DbTestCase):
55
+class RegexpFilterTestCase(test_base._DbTestCase):
56 56
 
57 57
     def setUp(self):
58 58
         super(RegexpFilterTestCase, self).setUp()
@@ -90,7 +90,7 @@ class RegexpFilterTestCase(test_base.DbTestCase):
90 90
         self._test_regexp_filter(u'♦', [])
91 91
 
92 92
 
93
-class SQLiteSavepointTest(test_base.DbTestCase):
93
+class SQLiteSavepointTest(test_base._DbTestCase):
94 94
     def setUp(self):
95 95
         super(SQLiteSavepointTest, self).setUp()
96 96
         meta = MetaData()
@@ -286,7 +286,7 @@ class QueryParamTest(test_base.DbTestCase):
286 286
         )
287 287
 
288 288
 
289
-class MySQLDefaultModeTestCase(test_base.MySQLOpportunisticTestCase):
289
+class MySQLDefaultModeTestCase(test_base._MySQLOpportunisticTestCase):
290 290
     def test_default_is_traditional(self):
291 291
         with self.engine.connect() as conn:
292 292
             sql_mode = conn.execute(
@@ -296,7 +296,7 @@ class MySQLDefaultModeTestCase(test_base.MySQLOpportunisticTestCase):
296 296
         self.assertIn("TRADITIONAL", sql_mode)
297 297
 
298 298
 
299
-class MySQLModeTestCase(test_base.MySQLOpportunisticTestCase):
299
+class MySQLModeTestCase(test_base._MySQLOpportunisticTestCase):
300 300
 
301 301
     def __init__(self, *args, **kwargs):
302 302
         super(MySQLModeTestCase, self).__init__(*args, **kwargs)
@@ -512,7 +512,7 @@ class SQLiteConnectTest(oslo_test.BaseTestCase):
512 512
         )
513 513
 
514 514
 
515
-class MysqlConnectTest(test_base.MySQLOpportunisticTestCase):
515
+class MysqlConnectTest(test_base._MySQLOpportunisticTestCase):
516 516
 
517 517
     def _fixture(self, sql_mode):
518 518
         return session.create_engine(self.engine.url, mysql_sql_mode=sql_mode)
@@ -790,7 +790,7 @@ class CreateEngineTest(oslo_test.BaseTestCase):
790 790
         )
791 791
 
792 792
 
793
-class ProcessGuardTest(test_base.DbTestCase):
793
+class ProcessGuardTest(test_base._DbTestCase):
794 794
     def test_process_guard(self):
795 795
         self.engine.dispose()
796 796
 
@@ -818,7 +818,7 @@ class ProcessGuardTest(test_base.DbTestCase):
818 818
         self.assertEqual(new_dbapi_id, newer_dbapi_id)
819 819
 
820 820
 
821
-class PatchStacktraceTest(test_base.DbTestCase):
821
+class PatchStacktraceTest(test_base._DbTestCase):
822 822
 
823 823
     def test_trace(self):
824 824
         engine = self.engine

+ 1
- 1
oslo_db/tests/sqlalchemy/test_types.py View File

@@ -33,7 +33,7 @@ class JsonTable(BASE, models.ModelBase):
33 33
     json = Column(types.JsonEncodedType)
34 34
 
35 35
 
36
-class JsonTypesTestCase(test_base.DbTestCase):
36
+class JsonTypesTestCase(test_base._DbTestCase):
37 37
     def setUp(self):
38 38
         super(JsonTypesTestCase, self).setUp()
39 39
         JsonTable.__table__.create(self.engine)

+ 3
- 3
oslo_db/tests/sqlalchemy/test_update_match.py View File

@@ -85,7 +85,7 @@ class ManufactureCriteriaTest(oslo_test_base.BaseTestCase):
85 85
         )
86 86
 
87 87
 
88
-class UpdateMatchTest(test_base.DbTestCase):
88
+class UpdateMatchTest(test_base._DbTestCase):
89 89
     def setUp(self):
90 90
         super(UpdateMatchTest, self).setUp()
91 91
         Base.metadata.create_all(self.engine)
@@ -435,11 +435,11 @@ class UpdateMatchTest(test_base.DbTestCase):
435 435
 
436 436
 class PGUpdateMatchTest(
437 437
         UpdateMatchTest,
438
-        test_base.PostgreSQLOpportunisticTestCase):
438
+        test_base._PostgreSQLOpportunisticTestCase):
439 439
     pass
440 440
 
441 441
 
442 442
 class MySQLUpdateMatchTest(
443 443
         UpdateMatchTest,
444
-        test_base.MySQLOpportunisticTestCase):
444
+        test_base._MySQLOpportunisticTestCase):
445 445
     pass

+ 7
- 7
oslo_db/tests/sqlalchemy/test_utils.py View File

@@ -547,7 +547,7 @@ class TestPaginateQueryActualSQL(test_base.BaseTestCase):
547 547
         )
548 548
 
549 549
 
550
-class TestMigrationUtils(db_test_base.DbTestCase):
550
+class TestMigrationUtils(db_test_base._DbTestCase):
551 551
 
552 552
     """Class for testing utils that are used in db migrations."""
553 553
 
@@ -957,14 +957,14 @@ class TestMigrationUtils(db_test_base.DbTestCase):
957 957
 
958 958
 
959 959
 class PostgresqlTestMigrations(TestMigrationUtils,
960
-                               db_test_base.PostgreSQLOpportunisticTestCase):
960
+                               db_test_base._PostgreSQLOpportunisticTestCase):
961 961
 
962 962
     """Test migrations on PostgreSQL."""
963 963
     pass
964 964
 
965 965
 
966 966
 class MySQLTestMigrations(TestMigrationUtils,
967
-                          db_test_base.MySQLOpportunisticTestCase):
967
+                          db_test_base._MySQLOpportunisticTestCase):
968 968
 
969 969
     """Test migrations on MySQL."""
970 970
     pass
@@ -1146,7 +1146,7 @@ class TestModelQuery(test_base.BaseTestCase):
1146 1146
         self.session.query.assert_called_with(MyModel.id)
1147 1147
 
1148 1148
 
1149
-class TestUtils(db_test_base.DbTestCase):
1149
+class TestUtils(db_test_base._DbTestCase):
1150 1150
     def setUp(self):
1151 1151
         super(TestUtils, self).setUp()
1152 1152
         meta = MetaData(bind=self.engine)
@@ -1222,12 +1222,12 @@ class TestUtils(db_test_base.DbTestCase):
1222 1222
 
1223 1223
 
1224 1224
 class TestUtilsMysqlOpportunistically(
1225
-        TestUtils, db_test_base.MySQLOpportunisticTestCase):
1225
+        TestUtils, db_test_base._MySQLOpportunisticTestCase):
1226 1226
     pass
1227 1227
 
1228 1228
 
1229 1229
 class TestUtilsPostgresqlOpportunistically(
1230
-        TestUtils, db_test_base.PostgreSQLOpportunisticTestCase):
1230
+        TestUtils, db_test_base._PostgreSQLOpportunisticTestCase):
1231 1231
     pass
1232 1232
 
1233 1233
 
@@ -1536,7 +1536,7 @@ class TestDialectFunctionDispatcher(test_base.BaseTestCase):
1536 1536
         )
1537 1537
 
1538 1538
 
1539
-class TestGetInnoDBTables(db_test_base.MySQLOpportunisticTestCase):
1539
+class TestGetInnoDBTables(db_test_base._MySQLOpportunisticTestCase):
1540 1540
 
1541 1541
     def test_all_tables_use_innodb(self):
1542 1542
         self.engine.execute("CREATE TABLE customers "

Loading…
Cancel
Save