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 '2019.2.1' into integration_terminate_fix

Browse source
This commit is contained in:
Charles McMarrow 2019-07-29 10:58:46 -06:00 • committed by GitHub
commit ba3e867f96
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
tests/integration/cloud/clouds/test_digitalocean.py
View file

@ -18,6 +18,7 @@ from tests.support.helpers import expensiveTest, generate_random_name
# Import Salt Libs
from salt.config import cloud_providers_config
from salt.ext.six.moves import range
import salt.utils.stringutils
# Create the cloud instance name to be used throughout the tests
@ -107,7 +108,7 @@ class DigitalOceanTest(ShellCase):
# generate key and fingerprint
ssh_key = RSA.generate(4096)
pub = ssh_key.publickey().exportKey("OpenSSH")
pub = salt.utils.stringutils.to_str(ssh_key.publickey().exportKey("OpenSSH"))
key_hex = hashlib.md5(base64.b64decode(pub.strip().split()[1].encode())).hexdigest()
finger_print = ':'.join([key_hex[x:x+2] for x in range(0, len(key_hex), 2)])

1
tests/integration/modules/test_system.py
View file

@ -409,6 +409,7 @@ class WinSystemModuleTest(ModuleCase):
finally:
self.run_function('system.set_computer_desc', [current_desc])
@skipIf(True, 'WAR ROOM 7/29/2019, unit test?')
def test_get_system_time(self):
'''
Test getting the system time