Merge "Revert "Fixing bug in "test_environment_generator.py""" into stable/pike

This commit is contained in:
Zuul 2017-12-29 07:17:59 +00:00 committed by Gerrit Code Review
commit 7b62e1a581
1 changed files with 2 additions and 4 deletions

View File

@ -480,13 +480,11 @@ parameter_defaults:
fake_template2, fake_nested_output]
mock_open.side_effect = mock_se
if not self.exception:
environment_generator.generate_environments('ignored.yaml',
'environments')
environment_generator.generate_environments('ignored.yaml')
else:
self.assertRaises(self.exception,
environment_generator.generate_environments,
'ignored.yaml',
'environments')
'ignored.yaml')
return
expected = environment_generator._FILE_HEADER + self.expected_output
with open(fake_output_path) as f: