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

Merge branch '2019.2.1' into add_pygit2

Browse Source
This commit is contained in:
Megan Wilhite 2019-07-31 17:43:22 -04:00 committed by GitHub
commit d1b145223a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/unit/modules/test_random_org.py
View File

@ -9,7 +9,7 @@ from __future__ import absolute_import, print_function, unicode_literals
# Import Salt Testing Libs
from tests.support.helpers import flaky
from tests.support.mixins import LoaderModuleMockMixin
from tests.support.unit import TestCase
from tests.support.unit import skipIf, TestCase
# Import Salt Libs
import salt.modules.random_org as random_org
@ -28,6 +28,7 @@ def check_status():
return False
@skipIf(True, 'WAR ROOM 7/31/2019, test needs to allow for quotas of random website')
class RandomOrgTestCase(TestCase, LoaderModuleMockMixin):
'''
Test cases for salt.modules.random_org

4
tests/unit/utils/test_pycrypto.py
View File

@ -20,7 +20,9 @@ class PycryptoTestCase(TestCase):
TestCase for salt.utils.pycrypto module
'''
@skipIf(salt.utils.platform.is_windows(), 'No crypto module for Windows')
# The crypt module is only available on Unix systems
# https://docs.python.org/dev/library/crypt.html
@skipIf(not salt.utils.pycrypto.HAS_CRYPT, 'crypt module not available')
def test_gen_hash(self):
'''
Test gen_hash