Merge pull request #42258 from twangboy/win_unit_states_tests_environ

Fix `unit.states.test_environ` for Windows
This commit is contained in:
Mike Place 2017-07-17 12:50:37 -05:00 committed by GitHub
commit 36395625c2

View file

@ -96,11 +96,14 @@ class TestEnvironState(TestCase, LoaderModuleMockMixin):
ret = envstate.setenv('notimportant', {'foo': 'bar'})
self.assertEqual(ret['changes'], {'foo': 'bar'})
ret = envstate.setenv('notimportant', {'test': False, 'foo': 'baz'}, false_unsets=True)
with patch.dict(envstate.__salt__, {'reg.read_value': MagicMock()}):
ret = envstate.setenv(
'notimportant', {'test': False, 'foo': 'baz'}, false_unsets=True)
self.assertEqual(ret['changes'], {'test': None, 'foo': 'baz'})
self.assertEqual(envstate.os.environ, {'INITIAL': 'initial', 'foo': 'baz'})
ret = envstate.setenv('notimportant', {'test': False, 'foo': 'bax'})
with patch.dict(envstate.__salt__, {'reg.read_value': MagicMock()}):
ret = envstate.setenv('notimportant', {'test': False, 'foo': 'bax'})
self.assertEqual(ret['changes'], {'test': '', 'foo': 'bax'})
self.assertEqual(envstate.os.environ, {'INITIAL': 'initial', 'foo': 'bax', 'test': ''})