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 #48009 from dwoz/winswarmfix

Browse source 
minionswarm runs on windows
This commit is contained in:
Nicole Thomas 2018-06-08 09:52:35 -04:00 • committed by GitHub
commit 871a910fcb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tests/minionswarm.py
View file

@ -9,7 +9,6 @@ on a single system to test scale capabilities
# Import Python Libs
from __future__ import absolute_import, print_function
import os
import pwd
import time
import signal
import optparse
@ -28,6 +27,7 @@ import salt
import yaml
import salt.ext.six as six
from salt.ext.six.moves import range # pylint: disable=import-error,redefined-builtin
import tests.support.helpers
OSES = [
@ -147,7 +147,7 @@ def parse():
'-c', '--config-dir', default='',
help=('Pass in a configuration directory containing base configuration.')
)
parser.add_option('-u', '--user', default=pwd.getpwuid(os.getuid()).pw_name)
parser.add_option('-u', '--user', default=tests.support.helpers.this_user())
options, _args = parser.parse_args()