openstack/deb-python-eventlet
Code Issues Proposed changes

Use built-in json for tests if available.

Browse Source
This commit is contained in:
Ryan Williams
2010-07-23 16:19:18 -07:00
parent 7ad062b258
commit 8ef5160cc9
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tests/__init__.py
View File

@@ -199,19 +199,22 @@ def get_database_auth():
retval = {'MySQLdb':{'host': 'localhost','user': 'root','passwd': ''}, retval = {'MySQLdb':{'host': 'localhost','user': 'root','passwd': ''},
'psycopg2':{'user':'test'}} 'psycopg2':{'user':'test'}}
try: try:
import simplejson import json
except ImportError: except ImportError:
print "No simplejson, using baked-in db credentials." try:
return retval import simplejson as json
except ImportError:
print "No json implementation, using baked-in db credentials."
return retval
if 'EVENTLET_DB_TEST_AUTH' in os.environ: if 'EVENTLET_DB_TEST_AUTH' in os.environ:
return simplejson.loads(os.environ.get('EVENTLET_DB_TEST_AUTH')) return json.loads(os.environ.get('EVENTLET_DB_TEST_AUTH'))
files = [os.path.join(os.path.dirname(__file__), '.test_dbauth'), files = [os.path.join(os.path.dirname(__file__), '.test_dbauth'),
os.path.join(os.path.expanduser('~'), '.test_dbauth')] os.path.join(os.path.expanduser('~'), '.test_dbauth')]
for f in files: for f in files:
try: try:
auth_utf8 = simplejson.load(open(f)) auth_utf8 = json.load(open(f))
# Have to convert unicode objects to str objects because # Have to convert unicode objects to str objects because
# mysqldb is dum. Using a doubly-nested list comprehension # mysqldb is dum. Using a doubly-nested list comprehension
# because we know that the structure is a two-level dict. # because we know that the structure is a two-level dict.