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

lint

Browse source
This commit is contained in:
Austin Papp 2019-03-26 17:50:09 -04:00 • committed by Daniel Wozniak
parent 4af99d8969
commit be94d6ad2e
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
tests/integration/runners/test_jobs.py
View file

@ -5,6 +5,10 @@ Tests for the salt-run command
from __future__ import absolute_import, print_function, unicode_literals
import pytest
# pylint: disable=3rd-party-module-not-gated
from salt.ext import six
# Import Salt Testing libs
from tests.support.case import ShellCase
from tests.support.unit import skipIf
@ -21,7 +25,7 @@ class JobsTest(ShellCase):
jobs.master
'''
ret = self.run_run_plus('jobs.master')
res = any(ele for ele in ret['return'] if val['fun'] == 'runner.jobs.master')
res = any(ele for ele in ret['return'] if ele['fun'] == 'runner.jobs.master')
self.assertTrue(res)
def test_active(self):
@ -29,8 +33,8 @@ class JobsTest(ShellCase):
jobs.active
"""
ret = self.run_run_plus('jobs.active')
res = any(ele for ele, val in ret['return'].iteritems() if val['Function'] == 'runner.jobs.active')
self.assertTrue()
res = any(ele for ele, val in six.iteritems(ret['return']) if val['Function'] == 'runner.jobs.active')
self.assertTrue(res)
@skipIf(True, "SLOWTEST skip")
def test_lookup_jid(self):

2
tests/integration/runners/test_runner_returns.py
View file

@ -79,7 +79,7 @@ class RunnerReturnsTest(ShellCase):
@skipIf(True, "SLOWTEST skip")
def test_runner_returns_disabled(self):
"""
Test with runner_returns enabled
Test with runner_returns disabled
"""
self.write_conf({"runner_returns": False})
ret = self.run_run_plus("test.arg", "foo", bar="hello world!")