mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
Merge pull request #49002 from rallytime/skip-jinja-deep-error-test
Skip test_jinja_deep_error on Debian 8
This commit is contained in:
commit
92d6c25c7f
1 changed files with 15 additions and 0 deletions
|
@ -9,6 +9,16 @@ from __future__ import absolute_import
|
|||
# Import Salt Testing libs
|
||||
from tests.support.case import ModuleCase
|
||||
|
||||
# Import Salt libs
|
||||
import salt.utils
|
||||
|
||||
# Import 3rd-Party libs
|
||||
HAS_LSB_RELEASE = True
|
||||
try:
|
||||
import lsb_release
|
||||
except ImportError:
|
||||
HAS_LSB_RELEASE = False
|
||||
|
||||
|
||||
class CompileTest(ModuleCase):
|
||||
'''
|
||||
|
@ -27,6 +37,11 @@ class CompileTest(ModuleCase):
|
|||
Test when we have an error in a execution module
|
||||
called by jinja
|
||||
'''
|
||||
if salt.utils.is_linux() and HAS_LSB_RELEASE:
|
||||
release = lsb_release.get_distro_information()
|
||||
if release.get('ID') == 'Debian' and int(release.get('RELEASE', 0)) < 9:
|
||||
self.skipTest('This test is flaky on Debian 8. Skipping.')
|
||||
|
||||
ret = self.run_function('state.sls', ['issue-10010'])
|
||||
self.assertTrue(
|
||||
', in jinja_error' in ret[0].strip())
|
||||
|
|
Loading…
Add table
Reference in a new issue