openstack/python-tripleoclient
Code Issues Proposed changes

Merge "Use environment fixture in tests"

Browse Source
This commit is contained in:
Jenkins
2016-11-23 15:21:07 +00:00
committed by Gerrit Code Review
parent 8352c9c664 e2f7c354df
commit a94e4d76a6
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tripleoclient/tests/v1/overcloud_deploy/test_overcloud_deploy.py
View File

@@ -615,7 +615,9 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud):
verifylist = [ verifylist = [
('templates', '/usr/share/openstack-tripleo-heat-templates/'), ('templates', '/usr/share/openstack-tripleo-heat-templates/'),
] ]
os.environ['TRIPLEO_ENVIRONMENT_DIRECTORY'] = self.tmp_dir.path self.useFixture(
fixtures.EnvironmentVariable('TRIPLEO_ENVIRONMENT_DIRECTORY',
self.tmp_dir.path))
def assertEqual(*args): def assertEqual(*args):
self.assertEqual(*args) self.assertEqual(*args)
@@ -673,7 +675,9 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud):
verifylist = [ verifylist = [
('templates', '/usr/share/openstack-tripleo-heat-templates/'), ('templates', '/usr/share/openstack-tripleo-heat-templates/'),
] ]
os.environ['TRIPLEO_ENVIRONMENT_DIRECTORY'] = self.tmp_dir.path self.useFixture(
fixtures.EnvironmentVariable('TRIPLEO_ENVIRONMENT_DIRECTORY',
self.tmp_dir.path))
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
error = self.assertRaises(hc_exc.CommandError, self.cmd.take_action, error = self.assertRaises(hc_exc.CommandError, self.cmd.take_action,