Merge "Improve test_environment_dirs verifylist check"

This commit is contained in:
Jenkins 2015-12-22 21:29:35 +00:00 committed by Gerrit Code Review
commit 30421f2362

View File

@ -524,12 +524,16 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud):
tmp_dir = self.useFixture(fixtures.TempDir()) tmp_dir = self.useFixture(fixtures.TempDir())
test_env = os.path.join(tmp_dir.path, 'foo.yaml') test_env = os.path.join(tmp_dir.path, 'foo.yaml')
env_dirs = [os.path.join(os.environ.get('HOME', ''), '.tripleo',
'environments'), tmp_dir.path]
with open(test_env, 'w') as temp_file: with open(test_env, 'w') as temp_file:
temp_file.write('#just a comment') temp_file.write('#just a comment')
arglist = ['--templates', '--environment-directory', tmp_dir.path] arglist = ['--templates', '--environment-directory', tmp_dir.path]
verifylist = [ verifylist = [
('templates', '/usr/share/openstack-tripleo-heat-templates/'), ('templates', '/usr/share/openstack-tripleo-heat-templates/'),
('environment_directories', env_dirs),
] ]
def _fake_heat_deploy(self, stack, stack_name, template_path, def _fake_heat_deploy(self, stack, stack_name, template_path,