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

All salt imports should be done at the global module level

Browse source
This commit is contained in:
Pedro Algarvio 2019-10-11 10:42:47 +01:00
parent b539b561e0
commit 7de939f6b2
No known key found for this signature in database
GPG key ID: BB36BF6584A298FF
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/conftest.py
View file

@ -55,6 +55,7 @@ import salt.utils.path
import salt.log.setup
import salt.log.mixins
import salt.utils.platform
import salt.utils.win_functions
from salt.serializers import yaml
from salt.utils.immutabletypes import freeze
@ -373,7 +374,6 @@ def pytest_runtest_setup(item):
item._skipped_by_mark = True
pytest.skip('You must be logged in as root to run this test')
else:
import salt.utils.win_functions
current_user = salt.utils.win_functions.get_current_user()
if current_user != 'SYSTEM':
if not salt.utils.win_functions.is_admin(current_user):