x/turbo-hipster
Code Issues Proposed changes

Only try jjb tests if slave scripts exist

Browse Source 
Check to make sure slave scripts are installed before trying to
run jjb scripts which rely on them.

Change-Id: Iedd7d4fdb05c0cb538f9f33f1e85e32c5c712b27
This commit is contained in:
Joshua Hesketh 2014-06-12 11:35:35 +10:00
parent 3c71d94570
commit bd5f7cd517
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tests/test_jjb_runner.py
View File

@ -26,21 +26,26 @@ from turbo_hipster.lib import utils
class TestTaskRunner(base.TestWithGearman): class TestTaskRunner(base.TestWithGearman):
log = logging.getLogger("TestTaskRunner") log = logging.getLogger("TestTaskRunner")
def setUp(self): def _grab_jjb(self):
super(TestTaskRunner, self).setUp()
# Grab a copy of JJB's config # Grab a copy of JJB's config
temp_path = self.useFixture(fixtures.TempDir()).path temp_path = self.useFixture(fixtures.TempDir()).path
cmd = 'git clone git://git.openstack.org/openstack-infra/config' cmd = 'git clone git://git.openstack.org/openstack-infra/config'
utils.execute_to_log(cmd, '/dev/null', cwd=temp_path) utils.execute_to_log(cmd, '/dev/null', cwd=temp_path)
self.jjb_config_dir = os.path.join( return os.path.join(
temp_path, 'config', temp_path, 'config',
'modules/openstack_project/files/jenkins_job_builder/config' 'modules/openstack_project/files/jenkins_job_builder/config'
) )
def test_job_can_shutdown_th(self): def test_jjb_pep8_job(self):
# We can only do this if we have the slave scripts installed in
# /usr/local/jenkins/slave_scripts/
if not os.path.isdir('/usr/local/jenkins/slave_scripts/'):
self.skipTest("Slave scripts aren't installed")
jjb_config_dir = self._grab_jjb()
self._load_config_fixture('jjb-config.yaml') self._load_config_fixture('jjb-config.yaml')
# set jjb_config to pulled in config # set jjb_config to pulled in config
self.config['plugins'][0]['jjb_config'] = self.jjb_config_dir self.config['plugins'][0]['jjb_config'] = jjb_config_dir
self.start_server() self.start_server()
zuul = fakes.FakeZuul(self.config['zuul_server']['gearman_host'], zuul = fakes.FakeZuul(self.config['zuul_server']['gearman_host'],