x/stackalytics
Code Issues Proposed changes

Use more specific asserts in tests

Browse Source 
Instead of assertTrue and assertFalse use more specific asserts.
They are compatible with Python 2.7[1] and 3.5[2]

[1]: https://docs.python.org/2.7/library/unittest.html
[2]: https://docs.python.org/3.5/library/unittest.html

Change-Id: I1f6c470e5f40f8cf715102ab659b434d925b7efa
This commit is contained in:
Béla Vancsics
2017-07-11 09:04:15 +02:00
parent 1a0765c8d5
commit ce876fd930
3 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
stackalytics/tests/unit/test_config_files.py
View File

@@ -136,8 +136,8 @@ class TestConfigFiles(testtools.TestCase):
self._verify_users_in_alphabetical_order('etc/test_default_data.json') self._verify_users_in_alphabetical_order('etc/test_default_data.json')
def _check_collision(self, storage, user, field, field_name): def _check_collision(self, storage, user, field, field_name):
self.assertFalse( self.assertNotIn(
field in storage, field, storage,
'Duplicate %s %s, collision between: %s and %s' 'Duplicate %s %s, collision between: %s and %s'
% (field_name, field, storage[field], user)) % (field_name, field, storage[field], user))
storage[field] = user storage[field] = user
@@ -148,23 +148,23 @@ class TestConfigFiles(testtools.TestCase):
for user in users: for user in users:
if user.get('launchpad_id'): if user.get('launchpad_id'):
field = user['launchpad_id'] field = user['launchpad_id']
self.assertFalse( self.assertNotIn(
field in storage, field, storage,
'Duplicate launchpad_id %s, collision between: %s and %s' 'Duplicate launchpad_id %s, collision between: %s and %s'
% (field, storage.get(field), user)) % (field, storage.get(field), user))
storage[field] = user storage[field] = user
if user.get('gerrit_id'): if user.get('gerrit_id'):
field = user['gerrit_id'] field = user['gerrit_id']
self.assertFalse( self.assertNotIn(
('gerrit:%s' % field) in storage, ('gerrit:%s' % field), storage,
'Duplicate gerrit_id %s, collision between: %s and %s' 'Duplicate gerrit_id %s, collision between: %s and %s'
% (field, storage.get(field), user)) % (field, storage.get(field), user))
storage['gerrit:%s' % field] = user storage['gerrit:%s' % field] = user
for email in user['emails']: for email in user['emails']:
self.assertFalse( self.assertNotIn(
email in storage, email, storage,
'Duplicate email %s, collision between: %s and %s' 'Duplicate email %s, collision between: %s and %s'
% (email, storage.get(email), user)) % (email, storage.get(email), user))
storage[email] = user storage[email] = user
@@ -180,7 +180,8 @@ class TestConfigFiles(testtools.TestCase):
line_n = 1 line_n = 1
for line in data.split('\n'): for line in data.split('\n'):
msg = 'Whitespace issue in "%s", line %s: ' % (line, line_n) msg = 'Whitespace issue in "%s", line %s: ' % (line, line_n)
self.assertTrue(line.find('\t') == -1, msg=msg + 'tab character') self.assertEqual(-1, line.find('\t'),
message=msg + 'tab character')
self.assertEqual(line.rstrip(), line, self.assertEqual(line.rstrip(), line,
message=msg + 'trailing spaces') message=msg + 'trailing spaces')
line_n += 1 line_n += 1
@@ -218,7 +219,7 @@ class TestConfigFiles(testtools.TestCase):
error_msg = ('Company "%s" is unknown. Please add it into' error_msg = ('Company "%s" is unknown. Please add it into'
' the list of companies in default_data.json ' ' the list of companies in default_data.json '
'file' % company['company_name']) 'file' % company['company_name'])
self.assertTrue(company['company_name'] in company_names, self.assertIn(company['company_name'], company_names,
error_msg) error_msg)
def test_default_data_user_companies(self): def test_default_data_user_companies(self):
@@ -243,9 +244,10 @@ class TestConfigFiles(testtools.TestCase):
if not c['end_date']: if not c['end_date']:
ops.add(c['company_name']) ops.add(c['company_name'])
self.assertTrue(len(ops) <= 1, self.assertLessEqual(
msg='More than 1 company is specified as current: ' len(ops), 1, msg='More than 1 company is specified '
'%s. Please keep only one' % ', '.join(ops)) 'as current: %s. Please keep '
'only one' % ', '.join(ops))
def test_default_data_users_one_open_interval(self): def test_default_data_users_one_open_interval(self):
self._verify_users_one_open_interval('etc/default_data.json') self._verify_users_one_open_interval('etc/default_data.json')

4
stackalytics/tests/unit/test_utils.py
View File

@@ -25,10 +25,10 @@ class TestUtils(testtools.TestCase):
elements = set() elements = set()
for chunk in utils.make_range(start, end, step): for chunk in utils.make_range(start, end, step):
for item in chunk: for item in chunk:
self.assertFalse(item in elements) self.assertNotIn(item, elements)
elements.add(item) elements.add(item)
self.assertTrue(set(range(start, end)) == elements) self.assertSetEqual(set(range(start, end)), elements)
def test_make_range_0_10_1(self): def test_make_range_0_10_1(self):
self._test_one_range(0, 10, 1) self._test_one_range(0, 10, 1)

4
stackalytics/tests/unit/test_vcs.py
View File

@@ -167,12 +167,12 @@ diff_stat:
self.assertEqual(0, commits[3]['lines_deleted']) self.assertEqual(0, commits[3]['lines_deleted'])
self.assertEqual(set(['dummy:fix-me']), self.assertEqual(set(['dummy:fix-me']),
set(commits[3]['blueprint_id'])) set(commits[3]['blueprint_id']))
self.assertFalse('coauthor' in commits[3]) self.assertNotIn('coauthor', commits[3])
self.assertEqual(0, commits[4]['files_changed']) self.assertEqual(0, commits[4]['files_changed'])
self.assertEqual(0, commits[4]['lines_added']) self.assertEqual(0, commits[4]['lines_added'])
self.assertEqual(0, commits[4]['lines_deleted']) self.assertEqual(0, commits[4]['lines_deleted'])
self.assertFalse('coauthor' in commits[4]) self.assertNotIn('coauthor', commits[4])
self.assertEqual('jeblair@openstack.org', commits[5]['author_email']) self.assertEqual('jeblair@openstack.org', commits[5]['author_email'])
self.assertEqual(0, commits[5]['files_changed']) self.assertEqual(0, commits[5]['files_changed'])