Limit scheduler_count to 1 for invalid tenant config tests

These tests raise a config error during the startup of the test case
which makes the first scheduler fail during its startup. The second (or
any additional) scheduler won't even run as the startup is serialized in
tests/base.py.

Thus it doesn't make sense to execute these tests with multiple
schedulers.

Change-Id: I9c6c29854c55edcac32d2ec922fe7e09939df5dd
This commit is contained in:
Felix Edel 2021-11-23 08:53:44 +01:00 committed by James E. Blair
parent 56d646a530
commit 596315785f
2 changed files with 39 additions and 0 deletions

View File

@ -956,6 +956,14 @@ class TestTenantExtra(TenantParserTestCase):
class TestTenantExtraConfigsInvalidType(TenantParserTestCase):
tenant_config_file = 'config/tenant-parser/extra_invalid_type.yaml'
# This test raises a config error during the startup of the test
# case which makes the first scheduler fail during its startup.
# The second (or any additional) scheduler won't even run as the
# startup is serialized in tests/base.py.
# Thus it doesn't make sense to execute this test with multiple
# schedulers.
scheduler_count = 1
def setUp(self):
err = "Expected str or list of str for extra-config-paths.*"
with testtools.ExpectedException(vs.MultipleInvalid, err):
@ -969,6 +977,14 @@ class TestTenantExtraConfigsInvalidType(TenantParserTestCase):
class TestTenantExtraConfigsInvalidValue(TenantParserTestCase):
tenant_config_file = 'config/tenant-parser/extra_invalid_value.yaml'
# This test raises a config error during the startup of the test
# case which makes the first scheduler fail during its startup.
# The second (or any additional) scheduler won't even run as the
# startup is serialized in tests/base.py.
# Thus it doesn't make sense to execute this test with multiple
# schedulers.
scheduler_count = 1
def setUp(self):
err = "Default zuul configs are not allowed in extra-config-paths.*"
with testtools.ExpectedException(vs.MultipleInvalid, err):
@ -981,6 +997,13 @@ class TestTenantExtraConfigsInvalidValue(TenantParserTestCase):
class TestTenantDuplicate(TenantParserTestCase):
tenant_config_file = 'config/tenant-parser/duplicate.yaml'
# This test raises a config error during the startup of the test
# case which makes the first scheduler fail during its startup.
# The second (or any additional) scheduler won't even run as the
# startup is serialized in tests/base.py.
# Thus it doesn't make sense to execute this test with multiple
# schedulers.
scheduler_count = 1
def setUp(self):

View File

@ -4336,6 +4336,14 @@ class TestValidateAllBroken(ZuulTestCase):
validate_tenants = []
tenant_config_file = 'config/broken/main.yaml'
# This test raises a config error during the startup of the test
# case which makes the first scheduler fail during its startup.
# The second (or any additional) scheduler won't even run as the
# startup is serialized in tests/base.py.
# Thus it doesn't make sense to execute this test with multiple
# schedulers.
scheduler_count = 1
def setUp(self):
self.assertRaises(zuul.configloader.ConfigurationSyntaxError,
super().setUp)
@ -4352,6 +4360,14 @@ class TestValidateBroken(ZuulTestCase):
validate_tenants = ['tenant-broken']
tenant_config_file = 'config/broken/main.yaml'
# This test raises a config error during the startup of the test
# case which makes the first scheduler fail during its startup.
# The second (or any additional) scheduler won't even run as the
# startup is serialized in tests/base.py.
# Thus it doesn't make sense to execute this test with multiple
# schedulers.
scheduler_count = 1
def setUp(self):
self.assertRaises(zuul.configloader.ConfigurationSyntaxError,
super().setUp)