PEP8
This commit is contained in:
parent
92a5414f25
commit
bdba519e02
@ -11,7 +11,11 @@ from swift.common.utils import readconf
|
||||
|
||||
setattr(__builtin__, '_', lambda x: x)
|
||||
|
||||
|
||||
def get_config():
|
||||
"""
|
||||
Attempt to get a functional config dictionary.
|
||||
"""
|
||||
config_file = os.environ.get('SWIFT_TEST_CONFIG_FILE',
|
||||
'/etc/swift/func_test.conf')
|
||||
config = {}
|
||||
@ -24,4 +28,3 @@ def get_config():
|
||||
except SystemExit:
|
||||
print >>sys.stderr, 'UNABLE TO READ FUNCTIONAL TESTS CONFIG FILE'
|
||||
return config
|
||||
|
||||
|
@ -29,7 +29,6 @@ import unittest
|
||||
import urllib
|
||||
|
||||
from test import get_config
|
||||
|
||||
from swift import Account, AuthenticationFailed, Connection, Container, \
|
||||
File, ResponseError
|
||||
|
||||
|
@ -75,6 +75,7 @@ token = [None, None, None]
|
||||
parsed = [None, None, None]
|
||||
conn = [None, None, None]
|
||||
|
||||
|
||||
def retry(func, *args, **kwargs):
|
||||
"""
|
||||
You can use the kwargs to override the 'retries' (default: 5) and
|
||||
|
@ -667,7 +667,6 @@ log_name = yarr'''
|
||||
# make sure its accurate to 10th of a second
|
||||
self.assertTrue(abs(100 - (time.time() - start) * 100) < 10)
|
||||
|
||||
|
||||
def test_search_tree(self):
|
||||
# file match & ext miss
|
||||
with temptree(['asdf.conf', 'blarg.conf', 'asdf.cfg']) as t:
|
||||
|
Loading…
Reference in New Issue
Block a user