Update tests for new environment handling

Signed-off-by: Joffrey F <joffrey@docker.com>
This commit is contained in:
Joffrey F 2016-03-07 17:18:19 -08:00
commit 5831b869e8
8 changed files with 32 additions and 41 deletions

View file

@ -13,7 +13,6 @@ from compose.config.interpolation import interpolate_environment_variables
@pytest.yield_fixture
def mock_env():
with mock.patch.dict(os.environ):
Environment.reset()
os.environ['USER'] = 'jenny'
os.environ['FOO'] = 'bar'
yield
@ -44,7 +43,9 @@ def test_interpolate_environment_variables_in_services(mock_env):
}
}
}
assert interpolate_environment_variables(services, 'service') == expected
assert interpolate_environment_variables(
services, 'service', Environment(None)
) == expected
def test_interpolate_environment_variables_in_volumes(mock_env):
@ -68,4 +69,6 @@ def test_interpolate_environment_variables_in_volumes(mock_env):
},
'other': {},
}
assert interpolate_environment_variables(volumes, 'volume') == expected
assert interpolate_environment_variables(
volumes, 'volume', Environment(None)
) == expected