openstack/swift
Code Issues Proposed changes

PEP8

Browse Source
This commit is contained in:
Clay Gerrard 2011-02-24 16:21:14 -06:00
parent 92a5414f25
commit bdba519e02
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/__init__.py
View File

@ -11,7 +11,11 @@ from swift.common.utils import readconf
setattr(__builtin__, '_', lambda x: x) setattr(__builtin__, '_', lambda x: x)
def get_config(): def get_config():
"""
Attempt to get a functional config dictionary.
"""
config_file = os.environ.get('SWIFT_TEST_CONFIG_FILE', config_file = os.environ.get('SWIFT_TEST_CONFIG_FILE',
'/etc/swift/func_test.conf') '/etc/swift/func_test.conf')
config = {} config = {}
@ -24,4 +28,3 @@ def get_config():
except SystemExit: except SystemExit:
print >>sys.stderr, 'UNABLE TO READ FUNCTIONAL TESTS CONFIG FILE' print >>sys.stderr, 'UNABLE TO READ FUNCTIONAL TESTS CONFIG FILE'
return config return config

1
test/functional/tests.py
View File

@ -29,7 +29,6 @@ import unittest
import urllib import urllib
from test import get_config from test import get_config
from swift import Account, AuthenticationFailed, Connection, Container, \ from swift import Account, AuthenticationFailed, Connection, Container, \
File, ResponseError File, ResponseError

1
test/functionalnosetests/swift_testing.py
View File

@ -75,6 +75,7 @@ token = [None, None, None]
parsed = [None, None, None] parsed = [None, None, None]
conn = [None, None, None] conn = [None, None, None]
def retry(func, *args, **kwargs): def retry(func, *args, **kwargs):
""" """
You can use the kwargs to override the 'retries' (default: 5) and You can use the kwargs to override the 'retries' (default: 5) and

1
test/unit/common/test_utils.py
View File

@ -667,7 +667,6 @@ log_name = yarr'''
# make sure its accurate to 10th of a second # make sure its accurate to 10th of a second
self.assertTrue(abs(100 - (time.time() - start) * 100) < 10) self.assertTrue(abs(100 - (time.time() - start) * 100) < 10)
def test_search_tree(self): def test_search_tree(self):
# file match & ext miss # file match & ext miss
with temptree(['asdf.conf', 'blarg.conf', 'asdf.cfg']) as t: with temptree(['asdf.conf', 'blarg.conf', 'asdf.cfg']) as t: