Merge "Remove ZuulDBTestCase"

tests/base.py

@@ -5690,11 +5690,6 @@ class SSLZuulTestCase(ZuulTestCase):
     use_ssl = True
 
 
-class ZuulDBTestCase(ZuulTestCase):
-    # TODO: Remove this and fake_sql arguments
-    pass
-
-
 class ZuulGithubAppTestCase(ZuulTestCase):
     def setup_config(self, config_file: str):
         config = super(ZuulGithubAppTestCase, self).setup_config(config_file)

tests/unit/test_connection.py

@@ -23,7 +23,7 @@ import sqlalchemy as sa
 import zuul
 from zuul.lib import yamlutil
 from tests.base import ZuulTestCase, FIXTURE_DIR, \
-    PostgresqlSchemaFixture, MySQLSchemaFixture, ZuulDBTestCase, \
+    PostgresqlSchemaFixture, MySQLSchemaFixture, \
     BaseTestCase, AnsibleZuulTestCase
 
 
@@ -67,7 +67,7 @@ class TestConnections(ZuulTestCase):
                          'civoter')
 
 
-class TestSQLConnectionMysql(ZuulDBTestCase):
+class TestSQLConnectionMysql(ZuulTestCase):
     config_file = 'zuul-sql-driver-mysql.conf'
     tenant_config_file = 'config/sql-driver/main.yaml'
     expected_table_prefix = ''

tests/unit/test_v3.py

@@ -31,7 +31,6 @@ import zuul.configloader
 from tests.base import (
     AnsibleZuulTestCase,
     ZuulTestCase,
-    ZuulDBTestCase,
     FIXTURE_DIR,
     simple_layout,
     iterate_timeout,
@@ -6596,7 +6595,7 @@ class TestProvidesRequiresBuildset(ZuulTestCase):
             }])
 
 
-class TestProvidesRequiresMysql(ZuulDBTestCase):
+class TestProvidesRequiresMysql(ZuulTestCase):
     config_file = "zuul-sql-driver-mysql.conf"
 
     @simple_layout('layouts/provides-requires.yaml')

tests/unit/test_web.py

@@ -27,7 +27,7 @@ import requests
 import zuul.web
 import zuul.rpcclient
 
-from tests.base import ZuulTestCase, ZuulDBTestCase, AnsibleZuulTestCase
+from tests.base import ZuulTestCase, AnsibleZuulTestCase
 from tests.base import ZuulWebFixture, FIXTURE_DIR, iterate_timeout
 from tests.base import simple_layout
 
@@ -1135,7 +1135,7 @@ class TestWebSecrets(BaseTestWeb):
         self.assertEqual('REDACTED', resp['ssh_keys'][0])
 
 
-class TestInfo(ZuulDBTestCase, BaseTestWeb):
+class TestInfo(BaseTestWeb):
 
     config_file = 'zuul-sql-driver-mysql.conf'
 
@@ -1263,7 +1263,7 @@ class TestGraphiteUrl(TestInfo):
     }
 
 
-class TestBuildInfo(ZuulDBTestCase, BaseTestWeb):
+class TestBuildInfo(BaseTestWeb):
     config_file = 'zuul-sql-driver-mysql.conf'
     tenant_config_file = 'config/sql-driver/main.yaml'
 
@@ -1377,7 +1377,7 @@ class TestBuildInfo(ZuulDBTestCase, BaseTestWeb):
                       builds[0]['error_detail'])
 
 
-class TestArtifacts(ZuulDBTestCase, BaseTestWeb, AnsibleZuulTestCase):
+class TestArtifacts(BaseTestWeb, AnsibleZuulTestCase):
     config_file = 'zuul-sql-driver-mysql.conf'
     tenant_config_file = 'config/sql-driver/main.yaml'
 
@@ -2374,7 +2374,7 @@ class TestTenantScopedWebApiTokenWithExpiry(BaseTestWeb):
         self.assertEqual("some reason", ah_request['reason'])
 
 
-class TestHeldAttributeInBuildInfo(ZuulDBTestCase, BaseTestWeb):
+class TestHeldAttributeInBuildInfo(BaseTestWeb):
     config_file = 'zuul-sql-driver-mysql.conf'
     tenant_config_file = 'config/sql-driver/main.yaml'
 

tests/zuul_client/test_zuulclient.py

@@ -24,7 +24,7 @@ import zuul.rpcclient
 from zuul.lib import yamlutil
 
 from tests.base import iterate_timeout
-from tests.base import ZuulDBTestCase, AnsibleZuulTestCase
+from tests.base import AnsibleZuulTestCase
 from tests.unit.test_web import BaseTestWeb
 
 
@@ -416,7 +416,7 @@ class TestZuulClientAdmin(BaseTestWeb):
         self.assertEqual(C.reported, 2)
 
 
-class TestZuulClientQueryData(ZuulDBTestCase, BaseTestWeb):
+class TestZuulClientQueryData(BaseTestWeb):
     """Test that zuul-client can fetch builds"""
     config_file = 'zuul-sql-driver-mysql.conf'
     tenant_config_file = 'config/sql-driver/main.yaml'