Merge pull request #49042 from rallytime/flaky-jinja-test

Mark a jinja template test as flaky
This commit is contained in:
Nicole Thomas 2018-08-09 17:05:53 -04:00 committed by GitHub
commit c606a32cf2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -14,6 +14,7 @@ import re
# Import Salt Testing libs
from tests.support.unit import skipIf, TestCase
from tests.support.case import ModuleCase
from tests.support.helpers import flaky
from tests.support.mock import NO_MOCK, NO_MOCK_REASON, patch, MagicMock, Mock
from tests.support.paths import TMP_CONF_DIR
@ -936,6 +937,7 @@ class TestCustomExtensions(TestCase):
dict(opts=self.local_opts, saltenv='test', salt=self.local_salt))
self.assertEqual(rendered, u'16777216')
@flaky
def test_http_query(self):
'''Test the `http_query` Jinja filter.'''
for backend in ('requests', 'tornado', 'urllib2'):