Skip to content
Snippets Groups Projects
Commit 60a1cdd9 authored by Erik Reid's avatar Erik Reid
Browse files

pep8

parent 03a91b0f
No related branches found
No related tags found
No related merge requests found
...@@ -19,7 +19,7 @@ if 'sentinel' in inventory_provider_config: ...@@ -19,7 +19,7 @@ if 'sentinel' in inventory_provider_config:
params = inventory_provider_config['sentinel'] params = inventory_provider_config['sentinel']
sentinel = redis.sentinel.Sentinel( sentinel = redis.sentinel.Sentinel(
[(params['hostname'], int(params['port']))], [(params['hostname'], int(params['port']))],
socket_timeout=0.5) socket_timeout=0.5)
master = sentinel.discover_master(params['name']) master = sentinel.discover_master(params['name'])
assert master assert master
_broker_hostname = master[0] _broker_hostname = master[0]
...@@ -35,7 +35,7 @@ if ':' in _broker_hostname: ...@@ -35,7 +35,7 @@ if ':' in _broker_hostname:
# assume this means hostname is an ipv6 address # assume this means hostname is an ipv6 address
_broker_hostname = '[%s]' % _broker_hostname _broker_hostname = '[%s]' % _broker_hostname
broker_url = result_backend ='redis://%s:%d/%d' % ( broker_url = result_backend = 'redis://%s:%d/%d' % (
_broker_hostname, _broker_port, _broker_db_index) _broker_hostname, _broker_port, _broker_db_index)
logger.debug('broker_url: %r' % broker_url) logger.debug('broker_url: %r' % broker_url)
......
...@@ -35,7 +35,8 @@ class InventoryTask(Task): ...@@ -35,7 +35,8 @@ class InventoryTask(Task):
if InventoryTask.config: if InventoryTask.config:
return return
assert os.path.isfile(os.environ['INVENTORY_PROVIDER_CONFIG_FILENAME']), ( assert os.path.isfile(
os.environ['INVENTORY_PROVIDER_CONFIG_FILENAME']), (
'config file %r not found' % 'config file %r not found' %
os.environ['INVENTORY_PROVIDER_CONFIG_FILENAME']) os.environ['INVENTORY_PROVIDER_CONFIG_FILENAME'])
......
...@@ -3,7 +3,6 @@ import json ...@@ -3,7 +3,6 @@ import json
import netifaces import netifaces
import os import os
import re import re
import shutil
import tempfile import tempfile
from lxml import etree from lxml import etree
...@@ -110,8 +109,6 @@ class MockedRedis(object): ...@@ -110,8 +109,6 @@ class MockedRedis(object):
pass pass
@pytest.fixture @pytest.fixture
def cached_test_data(): def cached_test_data():
filename = os.path.join(TEST_DATA_DIRNAME, "router-info.json") filename = os.path.join(TEST_DATA_DIRNAME, "router-info.json")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment