valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update old utils paths to new utils paths

Browse Source
This commit is contained in:
rallytime 2018-08-10 13:15:53 -04:00
parent 201031fa8a
commit ea6883ee55
No known key found for this signature in database
GPG Key ID: E8F1A4B90D0DEA19
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/integration/states/test_compiler.py
View File

@ -10,7 +10,7 @@ from __future__ import absolute_import, unicode_literals, print_function
from tests.support.case import ModuleCase
# Import Salt libs
import salt.utils
import salt.utils.platform
# Import 3rd-Party libs
HAS_LSB_RELEASE = True
@ -37,7 +37,7 @@ class CompileTest(ModuleCase):
Test when we have an error in a execution module
called by jinja
'''
if salt.utils.is_linux() and HAS_LSB_RELEASE:
if salt.utils.platform.is_linux() and HAS_LSB_RELEASE:
release = lsb_release.get_distro_information()
if release.get('ID') == 'Debian' and int(release.get('RELEASE', '0')[0]) < 9:
self.skipTest('This test is flaky on Debian 8. Skipping.')

2
tests/unit/loader/test_loader.py
View File

@ -1015,7 +1015,7 @@ class LazyLoaderOptimizationOrderTest(TestCase):
return 'lazyloadertest.pyc'
def _write_module_file(self):
with salt.utils.fopen(self.module_file, 'w') as fh:
with salt.utils.files.fopen(self.module_file, 'w') as fh:
fh.write(self.module_content)
fh.flush()
os.fsync(fh.fileno())