openstack/python-tripleoclient
Code Issues Proposed changes

Merge "Use absolute path when handling missing files"

Browse Source
This commit is contained in:
Jenkins
2016-12-07 12:22:38 +00:00
committed by Gerrit Code Review
parent 73756fce00 327ee8d5b8
commit 53a8815414
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -684,11 +684,19 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud):
mock_update_parameters.return_value = {}
mock_utils_endpoint.return_value = 'foo.bar'
os.mkdir(self.tmp_dir.join('env'))
os.mkdir(self.tmp_dir.join('common'))
test_env = self.tmp_dir.join('foo2.yaml')
test_env = self.tmp_dir.join('env/foo2.yaml')
with open(test_env, 'w') as temp_file:
temp_file.write('resource_registry:\n Test: /tmp/doesnexit.yaml')
temp_file.write('resource_registry:\n '
'Test1: ../common/bar.yaml\n '
'Test2: /tmp/doesnexit.yaml')
test_sub_env = self.tmp_dir.join('common/bar.yaml')
with open(test_sub_env, 'w') as temp_file:
temp_file.write('outputs:\n data:\n value: 1')
arglist = ['--templates']
verifylist = [
@@ -696,7 +704,7 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud):
]
self.useFixture(
fixtures.EnvironmentVariable('TRIPLEO_ENVIRONMENT_DIRECTORY',
self.tmp_dir.path))
self.tmp_dir.join('env')))
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
error = self.assertRaises(hc_exc.CommandError, self.cmd.take_action,