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

Fix geteuid stacktrace on Windows

Browse Source
This commit is contained in:
twangboy 2017-01-30 15:25:31 -07:00
parent 781c15de1c
commit c704eaa175
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/integration/__init__.py
View File

@ -37,6 +37,8 @@ STATE_FUNCTION_RUNNING_RE = re.compile(
INTEGRATION_TEST_DIR = os.path.dirname(
os.path.normpath(os.path.abspath(__file__))
)
if os.name == 'nt':
INTEGRATION_TEST_DIR = INTEGRATION_TEST_DIR.replace('\\', '\\\\')
CODE_DIR = os.path.dirname(os.path.dirname(INTEGRATION_TEST_DIR))
# Import Salt Testing libs

13
tests/runtests.py
View File

@ -352,9 +352,20 @@ class SaltTestsuiteParser(SaltCoverageTestingParser):
# Turn on expensive tests execution
os.environ['EXPENSIVE_TESTS'] = 'True'
import salt.utils
if salt.utils.is_windows():
import salt.utils.win_functions
current_user = salt.utils.win_functions.get_current_user()
if current_user == 'SYSTEM':
is_admin = True
else:
is_admin = salt.utils.win_functions.is_admin(current_user)
else:
is_admin = os.geteuid() == 0
if self.options.coverage and any((
self.options.name,
os.geteuid() != 0,
is_admin,
not self.options.run_destructive)) \
and self._check_enabled_suites(include_unit=True):
self.error(