Merge pull request #41994 from twangboy/win_unit_test_cmdmod

Fix `unit.modules.test_cmdmod` on Windows
This commit is contained in:
Mike Place 2017-08-21 15:53:01 -06:00 committed by GitHub
commit 5482524270

View file

@ -263,6 +263,7 @@ class CMDMODTestCase(TestCase, LoaderModuleMockMixin):
with patch('salt.utils.fopen', mock_open(read_data=MOCK_SHELL_FILE)):
self.assertFalse(cmdmod._is_valid_shell('foo'))
@skipIf(salt.utils.is_windows(), 'Do not run on Windows')
def test_os_environment_remains_intact(self):
'''
Make sure the OS environment is not tainted after running a command