Move test_test_config to a cmd-focused test suite
Testing configs got a lot more complicated with config repos, so it isn't buried in the scheduler anymore. We should still test the somewhat minimal facilities that exist now though. Change-Id: I0850e449faad6519ed8857d8f015cef3560eb509 Story: 2000773 Task: 4194
This commit is contained in:
@@ -2164,12 +2164,6 @@ class TestScheduler(ZuulTestCase):
|
||||
self.assertEqual(set(['project-test-nomatch-starts-empty',
|
||||
'project-test-nomatch-starts-full']), run_jobs)
|
||||
|
||||
@skip("Disabled for early v3 development")
|
||||
def test_test_config(self):
|
||||
"Test that we can test the config"
|
||||
self.sched.testConfig(self.config.get('zuul', 'tenant_config'),
|
||||
self.connections)
|
||||
|
||||
def test_queue_names(self):
|
||||
"Test shared change queue names"
|
||||
tenant = self.sched.abide.tenants.get('tenant-one')
|
||||
|
||||
@@ -0,0 +1,34 @@
|
||||
#!/usr/bin/env python
|
||||
|
||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||
# not use this file except in compliance with the License. You may obtain
|
||||
# a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
import os
|
||||
|
||||
import testtools
|
||||
import zuul.cmd.scheduler
|
||||
|
||||
from tests import base
|
||||
|
||||
|
||||
class TestSchedulerCmdArguments(testtools.TestCase):
|
||||
|
||||
def setUp(self):
|
||||
super(TestSchedulerCmdArguments, self).setUp()
|
||||
self.app = zuul.cmd.scheduler.Scheduler()
|
||||
|
||||
def test_test_config(self):
|
||||
conf_path = os.path.join(base.FIXTURE_DIR, 'zuul.conf')
|
||||
self.app.parse_arguments(['-t', '-c', conf_path])
|
||||
self.assertTrue(self.app.args.validate)
|
||||
self.app.read_config()
|
||||
self.assertEqual(0, self.app.test_config())
|
||||
@@ -40,7 +40,7 @@ class Scheduler(zuul.cmd.ZuulApp):
|
||||
super(Scheduler, self).__init__()
|
||||
self.gear_server_pid = None
|
||||
|
||||
def parse_arguments(self):
|
||||
def parse_arguments(self, args=None):
|
||||
parser = argparse.ArgumentParser(description='Project gating system.')
|
||||
parser.add_argument('-c', dest='config',
|
||||
help='specify the config file')
|
||||
@@ -52,7 +52,7 @@ class Scheduler(zuul.cmd.ZuulApp):
|
||||
parser.add_argument('--version', dest='version', action='version',
|
||||
version=self._get_version(),
|
||||
help='show zuul version')
|
||||
self.args = parser.parse_args()
|
||||
self.args = parser.parse_args(args)
|
||||
|
||||
def reconfigure_handler(self, signum, frame):
|
||||
signal.signal(signal.SIGHUP, signal.SIG_IGN)
|
||||
|
||||
Reference in New Issue
Block a user