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

Merge pull request #36355 from rallytime/bp-36288

Browse Source 
Back-port #36288 to 2015.8
This commit is contained in:
Nicole Thomas 2016-09-16 08:59:47 -06:00 committed by GitHub
commit df9d9b3624
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/unit/utils/config_test.py
View File

@ -6,6 +6,8 @@
# Import python libs
from __future__ import absolute_import
from distutils.version import LooseVersion
# Import Salt Testing Libs
from salttesting import TestCase, skipIf
from salttesting.helpers import ensure_in_syspath
@ -20,7 +22,9 @@ try:
import jsonschema
import jsonschema.exceptions
HAS_JSONSCHEMA = True
JSONSCHEMA_VERSION = jsonschema.__version__
except ImportError:
JSONSCHEMA_VERSION = ''
HAS_JSONSCHEMA = False
@ -746,6 +750,7 @@ class ConfigTestCase(TestCase):
)
@skipIf(HAS_JSONSCHEMA is False, 'The \'jsonschema\' library is missing')
@skipIf(HAS_JSONSCHEMA and LooseVersion(jsonschema.__version__) <= LooseVersion('2.5.0'), 'Requires jsonschema 2.5.0 or greater')
def test_ipv4_config_validation(self):
class TestConf(schema.Schema):
item = schema.IPv4Item(title='Item', description='Item description')