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 pull request #49614 from rallytime/bp-49546

Browse source 
Back-port #49546 to 2017.7
This commit is contained in:
Nicole Thomas 2018-09-11 16:55:40 -04:00 • committed by GitHub
commit 2f6cdd9fd5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/unit/serializers/test_serializers.py
View file

@ -93,7 +93,7 @@ class TestSerializers(TestCase):
@skipIf(not yaml.available, SKIP_MESSAGE % 'yaml')
@skipIf(not yamlex.available, SKIP_MESSAGE % 'sls')
@flaky
@skipIf(six.PY3, 'Flaky on Python 3.')
def test_compare_sls_vs_yaml_with_jinja(self):
tpl = '{{ data }}'
env = jinja2.Environment()