Fix some warnings in tests

Browse Source
This commit is contained in:
Stefan Wehrmeyer 2015-01-06 21:57:32 +01:00
parent d2f36d6413
commit ee12dd45cc
2 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
test/test_freeze.py
View File

@ -29,9 +29,9 @@ class FreezeTestCase(unittest.TestCase):
from dataset.freeze.app import freeze from dataset.freeze.app import freeze
freeze(self.db['weather'].all(), format='csv', filename='wäther.csv'.encode('utf8'), prefix=self.d) freeze(self.db['weather'].all(), format='csv', filename='wäther.csv'.encode('utf8'), prefix=self.d)
self.assert_(os.path.exists(os.path.join(self.d, 'wäther.csv'))) self.assertTrue(os.path.exists(os.path.join(self.d, 'wäther.csv')))
freeze(self.db['weather'].all(), format='csv', filename='wäther.csv', prefix=self.d) freeze(self.db['weather'].all(), format='csv', filename='wäther.csv', prefix=self.d)
self.assert_(os.path.exists(os.path.join(self.d, 'wäther.csv'))) self.assertTrue(os.path.exists(os.path.join(self.d, 'wäther.csv')))
def test_freeze_csv(self): def test_freeze_csv(self):
from dataset.freeze.app import freeze from dataset.freeze.app import freeze
@ -43,23 +43,26 @@ class FreezeTestCase(unittest.TestCase):
fh = open(path, 'rt', encoding='utf8', newline='') fh = open(path, 'rt', encoding='utf8', newline='')
else: else:
fh = open(path, 'rU') fh = open(path, 'rU')
rows = list(reader(fh)) try:
keys = rows[0] rows = list(reader(fh))
if not PY3: keys = rows[0]
keys = [k.decode('utf8') for k in keys] if not PY3:
for i, d1 in enumerate(TEST_DATA): keys = [k.decode('utf8') for k in keys]
d2 = dict(zip(keys, rows[i + 1])) for i, d1 in enumerate(TEST_DATA):
for k in d1.keys(): d2 = dict(zip(keys, rows[i + 1]))
v2 = d2[k] for k in d1.keys():
if not PY3: v2 = d2[k]
v2 = v2.decode('utf8') if not PY3:
v1 = value_to_str(d1[k]) v2 = v2.decode('utf8')
if not isinstance(v1, text_type): v1 = value_to_str(d1[k])
if isinstance(v1, binary_type): if not isinstance(v1, text_type):
v1 = text_type(v1, encoding='utf8') if isinstance(v1, binary_type):
else: v1 = text_type(v1, encoding='utf8')
v1 = '%s' % v1 else:
self.assertEqual(v2, v1) v1 = '%s' % v1
self.assertEqual(v2, v1)
finally:
fh.close()
class SerializerTestCase(unittest.TestCase): class SerializerTestCase(unittest.TestCase):
@ -74,4 +77,4 @@ class SerializerTestCase(unittest.TestCase):
s = Serializer(Export({'filename': 'f'}, {}), '') s = Serializer(Export({'filename': 'f'}, {}), '')
s.wrap s.wrap
s = Serializer(Export({'filename': '-'}, {}), '') s = Serializer(Export({'filename': '-'}, {}), '')
self.assert_(s.fileobj) self.assertTrue(s.fileobj)

2
test/test_freeze_config.py
View File

@ -23,7 +23,7 @@ class TestConfiguration(unittest.TestCase):
self.assertTrue(exports[0].get_bool('bool')) self.assertTrue(exports[0].get_bool('bool'))
self.assertEqual(exports[0].get_int('nan', 'default'), 'default') self.assertEqual(exports[0].get_int('nan', 'default'), 'default')
self.assertEqual(exports[0].get_int('number'), 5) self.assertEqual(exports[0].get_int('number'), 5)
self.assert_(exports[0].name) self.assertTrue(exports[0].name)
def test_exports_fail(self): def test_exports_fail(self):
from dataset.freeze.config import Configuration from dataset.freeze.config import Configuration