saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #49192 from dwoz/git_test_fix_ng

Browse source 
Test fixes flaky test and unicode environment key/value
This commit is contained in:
Daniel Wozniak 2018-08-19 03:48:02 -07:00 • committed by GitHub
commit aaa9e37215
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/integration/modules/test_pip.py
View file

@ -53,6 +53,8 @@ class PipModuleTest(ModuleCase):
del self.pip_temp
if 'PIP_SOURCE_DIR' in os.environ:
os.environ.pop('PIP_SOURCE_DIR')
if 'PIP_BUILD_DIR' in os.environ:
os.environ.pop('PIP_BUILD_DIR')
def _check_download_error(self, ret):
'''

3
tests/integration/modules/test_system.py
View file

@ -12,7 +12,7 @@ import textwrap
# Import Salt Testing libs
from tests.support.case import ModuleCase
from tests.support.unit import skipIf
from tests.support.helpers import destructiveTest, skip_if_not_root
from tests.support.helpers import destructiveTest, skip_if_not_root, flaky
# Import Salt libs
import salt.utils.files
@ -255,6 +255,7 @@ class SystemModuleTest(ModuleCase):
self.assertTrue(self._same_times(time_now, cmp_time), msg=msg)
self._test_hwclock_sync()
@flaky
@destructiveTest
@skip_if_not_root
def test_set_system_time(self):