openstack/swift
Code Issues Proposed changes

Fixed test based on testdir

Browse Source
This commit is contained in:
gholt 2011-08-01 21:14:41 +00:00
parent 671117e1d9
commit a68e5d883c
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
test/unit/common/test_db.py
View File

@ -203,6 +203,12 @@ class TestDatabaseBroker(unittest.TestCase):
orig_renamer = swift.common.db.renamer orig_renamer = swift.common.db.renamer
try: try:
swift.common.db.renamer = lambda a, b: b swift.common.db.renamer = lambda a, b: b
qpath = os.path.dirname(os.path.dirname(os.path.dirname(
os.path.dirname(self.testdir))))
if qpath:
qpath += '/quarantined/test/db'
else:
qpath = 'quarantined/test/db'
# Test malformed database # Test malformed database
fp = open(os.path.join(self.testdir, '1.db'), 'wb') fp = open(os.path.join(self.testdir, '1.db'), 'wb')
fp.write(EXAMPLE_MALFORMED_DB.decode('hex')) fp.write(EXAMPLE_MALFORMED_DB.decode('hex'))
@ -215,9 +221,9 @@ class TestDatabaseBroker(unittest.TestCase):
conn.execute('SELECT * FROM test') conn.execute('SELECT * FROM test')
except Exception, err: except Exception, err:
exc = err exc = err
self.assertTrue(str(exc).startswith( self.assertEquals(str(exc),
'Quarantined test/unit/common/db to quarantined/test/db')) 'Quarantined %s to %s due to malformed database' %
self.assertTrue(str(exc).endswith(' due to malformed database')) (self.testdir, qpath))
# Test corrupted database # Test corrupted database
fp = open(os.path.join(self.testdir, '1.db'), 'wb') fp = open(os.path.join(self.testdir, '1.db'), 'wb')
fp.write(EXAMPLE_CORRUPTED_DB.decode('hex')) fp.write(EXAMPLE_CORRUPTED_DB.decode('hex'))
@ -230,9 +236,9 @@ class TestDatabaseBroker(unittest.TestCase):
conn.execute('SELECT * FROM test') conn.execute('SELECT * FROM test')
except Exception, err: except Exception, err:
exc = err exc = err
self.assertTrue(str(exc).startswith( self.assertEquals(str(exc),
'Quarantined test/unit/common/db to quarantined/test/db')) 'Quarantined %s to %s due to corrupted database' %
self.assertTrue(str(exc).endswith(' due to corrupted database')) (self.testdir, qpath))
finally: finally:
swift.common.db.renamer = orig_renamer swift.common.db.renamer = orig_renamer