openstack/openstack-ansible
Code Issues Proposed changes

Merge "Call load_environment before mocking it"

Browse Source
This commit is contained in:
Jenkins 2016-12-22 00:34:42 +00:00 committed by Gerrit Code Review
commit e7e6d27469
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/test_inventory.py
View File

@ -449,6 +449,7 @@ class TestIps(unittest.TestCase):
def setUp(self):
# Allow custom assertion errors.
self.longMessage = True
self.env = fs.load_environment(BASE_ENV_DIR, {})
@mock.patch('filesystem.load_environment')
@mock.patch('filesystem.load_user_configuration')
@ -457,7 +458,7 @@ class TestIps(unittest.TestCase):
# Grab our values read from the file system just once.
mock_load_config.return_value = get_config()
mock_load_env.return_value = fs.load_environment(BASE_ENV_DIR, {})
mock_load_env.return_value = self.env
mock_open = mock.mock_open()