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 branch '2017.7' into Issue47689-pip-state-performance

Browse source
This commit is contained in:
Nicole Thomas 2018-05-21 10:56:59 -04:00 • committed by GitHub
commit 0d19803106
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/modules/win_system.py
View file

@ -510,7 +510,7 @@ def get_system_info():
.. code-block:: bash
salt 'minion-id' system.get_info
salt 'minion-id' system.get_system_info
'''
os_type = {1: 'Work Station',
2: 'Domain Controller',

10
tests/integration/cloud/providers/test_ec2.py
View file

@ -18,11 +18,12 @@ import salt.utils
from tests.support.case import ShellCase
from tests.support.paths import FILES
from tests.support.helpers import expensiveTest
from tests.support.unit import expectedFailure
from tests.support.unit import expectedFailure, skipIf
from tests.support import win_installer
# Import Third-Party Libs
from salt.ext.six.moves import range # pylint: disable=import-error,redefined-builtin
import salt.utils.cloud
def __random_name(size=6):
@ -37,6 +38,7 @@ def __random_name(size=6):
# Create the cloud instance name to be used throughout the tests
INSTANCE_NAME = __random_name()
PROVIDER_NAME = 'ec2'
HAS_WINRM = salt.utils.cloud.HAS_WINRM and salt.utils.cloud.HAS_SMB
class EC2Test(ShellCase):
@ -238,6 +240,7 @@ class EC2Test(ShellCase):
)
self._test_instance('ec2-win2012r2-test', debug=True, timeout=500)
@skipIf(not HAS_WINRM, 'Skip when winrm dependencies are missing')
def test_win2012r2_winrm(self):
'''
Tests creating and deleting a Windows 2012r2 instance on EC2 using
@ -252,7 +255,7 @@ class EC2Test(ShellCase):
}
)
self._test_instance('ec2-win2012r2-test', debug=True, timeout=500)
self._test_instance('ec2-win2012r2-test', debug=True, timeout=800)
@expectedFailure
def test_win2016_winexe(self):
@ -272,6 +275,7 @@ class EC2Test(ShellCase):
)
self._test_instance('ec2-win2016-test', debug=True, timeout=500)
@skipIf(not HAS_WINRM, 'Skip when winrm dependencies are missing')
def test_win2016_winrm(self):
'''
Tests creating and deleting a Windows 2016 instance on EC2 using winrm
@ -286,7 +290,7 @@ class EC2Test(ShellCase):
}
)
self._test_instance('ec2-win2016-test', debug=True, timeout=500)
self._test_instance('ec2-win2016-test', debug=True, timeout=800)
def tearDown(self):
'''