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

Fix linter issues

Browse source
This commit is contained in:
Daniel A. Wozniak 2018-09-10 10:00:25 -07:00
parent ccbcb5588a
commit 10ec8beb39
No known key found for this signature in database
GPG key ID: 166B9D2C06C82D61
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tests/integration/files/log_handlers/runtests_log_handler.py
View file

@ -34,8 +34,8 @@ __virtualname__ = 'runtests_log_handler'
def __virtual__():
if 'runtests_log_port' not in __opts__:
return False, "'runtests_log_port' not in options"
# if six.PY3:
# return False, "runtests external logging handler is temporarily disabled for Python 3 tests"
if six.PY3:
return False, "runtests external logging handler is temporarily disabled for Python 3 tests"
return True

2
tests/support/jinja_filters.py
View file

@ -189,7 +189,7 @@ class JinjaFiltersTest(object):
self.assertIn('module_|-test_|-test.echo_|-run', ret)
self.assertEqual(ret['module_|-test_|-test.echo_|-run']['changes'],
_expected)
except:
finally:
if salt.utils.platform.is_windows():
os.remove('c:\\empty_file')