From 39bb623bdc363b5ef212b4a23d155fbf4d8883e9 Mon Sep 17 00:00:00 2001 From: Daniel Wallace Date: Tue, 28 Feb 2017 14:53:02 -0600 Subject: [PATCH] fix pylint --- salt/runners/queue.py | 6 +++--- tests/unit/runners/test_queue.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/salt/runners/queue.py b/salt/runners/queue.py index 76bc8f25e0..fd66273fd9 100644 --- a/salt/runners/queue.py +++ b/salt/runners/queue.py @@ -70,8 +70,8 @@ from __future__ import absolute_import # Import salt libs import salt.loader -import salt.utils.event -from salt.utils.event import tagify +import salt.ext.six as six +from salt.utils.event import get_event, tagify from salt.exceptions import SaltInvocationError @@ -209,7 +209,7 @@ def process_queue(queue, quantity=1, backend='sqlite'): salt-run queue.process_queue myqueue all backend=sqlite ''' # get ready to send an event - event = salt.utils.event.get_event( + event = get_event( 'master', __opts__['sock_dir'], __opts__['transport'], diff --git a/tests/unit/runners/test_queue.py b/tests/unit/runners/test_queue.py index 6a20eee179..bab3e3dd22 100644 --- a/tests/unit/runners/test_queue.py +++ b/tests/unit/runners/test_queue.py @@ -20,11 +20,11 @@ ensure_in_syspath('../../') # Import Salt Libs from salt.runners import queue as queue_mod -from salt.queues import pgjsonb_queue queue_mod.__opts__ = {'sock_dir': '/var/run/salt/master', 'transport': 'zeromq'} queue_mod.__salt__ = {} + @skipIf(NO_MOCK, NO_MOCK_REASON) class QueueTest(TestCase): '''