Merge "Remove ZuulDBTestCase"
This commit is contained in:
commit
95ee8e8150
|
@ -5690,11 +5690,6 @@ class SSLZuulTestCase(ZuulTestCase):
|
||||||
use_ssl = True
|
use_ssl = True
|
||||||
|
|
||||||
|
|
||||||
class ZuulDBTestCase(ZuulTestCase):
|
|
||||||
# TODO: Remove this and fake_sql arguments
|
|
||||||
pass
|
|
||||||
|
|
||||||
|
|
||||||
class ZuulGithubAppTestCase(ZuulTestCase):
|
class ZuulGithubAppTestCase(ZuulTestCase):
|
||||||
def setup_config(self, config_file: str):
|
def setup_config(self, config_file: str):
|
||||||
config = super(ZuulGithubAppTestCase, self).setup_config(config_file)
|
config = super(ZuulGithubAppTestCase, self).setup_config(config_file)
|
||||||
|
|
|
@ -23,7 +23,7 @@ import sqlalchemy as sa
|
||||||
import zuul
|
import zuul
|
||||||
from zuul.lib import yamlutil
|
from zuul.lib import yamlutil
|
||||||
from tests.base import ZuulTestCase, FIXTURE_DIR, \
|
from tests.base import ZuulTestCase, FIXTURE_DIR, \
|
||||||
PostgresqlSchemaFixture, MySQLSchemaFixture, ZuulDBTestCase, \
|
PostgresqlSchemaFixture, MySQLSchemaFixture, \
|
||||||
BaseTestCase, AnsibleZuulTestCase
|
BaseTestCase, AnsibleZuulTestCase
|
||||||
|
|
||||||
|
|
||||||
|
@ -67,7 +67,7 @@ class TestConnections(ZuulTestCase):
|
||||||
'civoter')
|
'civoter')
|
||||||
|
|
||||||
|
|
||||||
class TestSQLConnectionMysql(ZuulDBTestCase):
|
class TestSQLConnectionMysql(ZuulTestCase):
|
||||||
config_file = 'zuul-sql-driver-mysql.conf'
|
config_file = 'zuul-sql-driver-mysql.conf'
|
||||||
tenant_config_file = 'config/sql-driver/main.yaml'
|
tenant_config_file = 'config/sql-driver/main.yaml'
|
||||||
expected_table_prefix = ''
|
expected_table_prefix = ''
|
||||||
|
|
|
@ -31,7 +31,6 @@ import zuul.configloader
|
||||||
from tests.base import (
|
from tests.base import (
|
||||||
AnsibleZuulTestCase,
|
AnsibleZuulTestCase,
|
||||||
ZuulTestCase,
|
ZuulTestCase,
|
||||||
ZuulDBTestCase,
|
|
||||||
FIXTURE_DIR,
|
FIXTURE_DIR,
|
||||||
simple_layout,
|
simple_layout,
|
||||||
iterate_timeout,
|
iterate_timeout,
|
||||||
|
@ -6596,7 +6595,7 @@ class TestProvidesRequiresBuildset(ZuulTestCase):
|
||||||
}])
|
}])
|
||||||
|
|
||||||
|
|
||||||
class TestProvidesRequiresMysql(ZuulDBTestCase):
|
class TestProvidesRequiresMysql(ZuulTestCase):
|
||||||
config_file = "zuul-sql-driver-mysql.conf"
|
config_file = "zuul-sql-driver-mysql.conf"
|
||||||
|
|
||||||
@simple_layout('layouts/provides-requires.yaml')
|
@simple_layout('layouts/provides-requires.yaml')
|
||||||
|
|
|
@ -27,7 +27,7 @@ import requests
|
||||||
import zuul.web
|
import zuul.web
|
||||||
import zuul.rpcclient
|
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 ZuulWebFixture, FIXTURE_DIR, iterate_timeout
|
||||||
from tests.base import simple_layout
|
from tests.base import simple_layout
|
||||||
|
|
||||||
|
@ -1135,7 +1135,7 @@ class TestWebSecrets(BaseTestWeb):
|
||||||
self.assertEqual('REDACTED', resp['ssh_keys'][0])
|
self.assertEqual('REDACTED', resp['ssh_keys'][0])
|
||||||
|
|
||||||
|
|
||||||
class TestInfo(ZuulDBTestCase, BaseTestWeb):
|
class TestInfo(BaseTestWeb):
|
||||||
|
|
||||||
config_file = 'zuul-sql-driver-mysql.conf'
|
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'
|
config_file = 'zuul-sql-driver-mysql.conf'
|
||||||
tenant_config_file = 'config/sql-driver/main.yaml'
|
tenant_config_file = 'config/sql-driver/main.yaml'
|
||||||
|
|
||||||
|
@ -1377,7 +1377,7 @@ class TestBuildInfo(ZuulDBTestCase, BaseTestWeb):
|
||||||
builds[0]['error_detail'])
|
builds[0]['error_detail'])
|
||||||
|
|
||||||
|
|
||||||
class TestArtifacts(ZuulDBTestCase, BaseTestWeb, AnsibleZuulTestCase):
|
class TestArtifacts(BaseTestWeb, AnsibleZuulTestCase):
|
||||||
config_file = 'zuul-sql-driver-mysql.conf'
|
config_file = 'zuul-sql-driver-mysql.conf'
|
||||||
tenant_config_file = 'config/sql-driver/main.yaml'
|
tenant_config_file = 'config/sql-driver/main.yaml'
|
||||||
|
|
||||||
|
@ -2374,7 +2374,7 @@ class TestTenantScopedWebApiTokenWithExpiry(BaseTestWeb):
|
||||||
self.assertEqual("some reason", ah_request['reason'])
|
self.assertEqual("some reason", ah_request['reason'])
|
||||||
|
|
||||||
|
|
||||||
class TestHeldAttributeInBuildInfo(ZuulDBTestCase, BaseTestWeb):
|
class TestHeldAttributeInBuildInfo(BaseTestWeb):
|
||||||
config_file = 'zuul-sql-driver-mysql.conf'
|
config_file = 'zuul-sql-driver-mysql.conf'
|
||||||
tenant_config_file = 'config/sql-driver/main.yaml'
|
tenant_config_file = 'config/sql-driver/main.yaml'
|
||||||
|
|
||||||
|
|
|
@ -24,7 +24,7 @@ import zuul.rpcclient
|
||||||
from zuul.lib import yamlutil
|
from zuul.lib import yamlutil
|
||||||
|
|
||||||
from tests.base import iterate_timeout
|
from tests.base import iterate_timeout
|
||||||
from tests.base import ZuulDBTestCase, AnsibleZuulTestCase
|
from tests.base import AnsibleZuulTestCase
|
||||||
from tests.unit.test_web import BaseTestWeb
|
from tests.unit.test_web import BaseTestWeb
|
||||||
|
|
||||||
|
|
||||||
|
@ -416,7 +416,7 @@ class TestZuulClientAdmin(BaseTestWeb):
|
||||||
self.assertEqual(C.reported, 2)
|
self.assertEqual(C.reported, 2)
|
||||||
|
|
||||||
|
|
||||||
class TestZuulClientQueryData(ZuulDBTestCase, BaseTestWeb):
|
class TestZuulClientQueryData(BaseTestWeb):
|
||||||
"""Test that zuul-client can fetch builds"""
|
"""Test that zuul-client can fetch builds"""
|
||||||
config_file = 'zuul-sql-driver-mysql.conf'
|
config_file = 'zuul-sql-driver-mysql.conf'
|
||||||
tenant_config_file = 'config/sql-driver/main.yaml'
|
tenant_config_file = 'config/sql-driver/main.yaml'
|
||||||
|
|
Loading…
Reference in New Issue