archive/pillar
0
0
Fork 0
Code Issues 42 Pull Requests Projects Releases Wiki Activity

UnitTest.assertEquals is deprecated, replaced by assertEqual

Browse Source
This commit is contained in:
Sybren A. Stüvel 2019-05-10 16:28:23 +02:00
parent b66247881b
commit 47d5c6cbad
9 changed files with 66 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/test_api/test_cerberus.py
View File

@ -209,10 +209,10 @@ class IPRangeValidatorTest(AbstractSchemaValidationTest):
def test_descriptive_error_message(self):
is_valid = self.validator.validate({'iprange': '::/0'}, self.schema)
self.assertFalse(is_valid)
self.assertEquals(1, len(self.validator._errors))
self.assertEqual(1, len(self.validator._errors))
err = self.validator._errors[0]
self.assertEquals(('iprange', ), err.document_path)
self.assertEquals(('Zero-length prefix is not allowed',), err.info)
self.assertEqual(('iprange', ), err.document_path)
self.assertEqual(('Zero-length prefix is not allowed',), err.info)
class MarkdownValidatorTest(AbstractSchemaValidationTest):

12
tests/test_api/test_latest.py
View File

@ -143,8 +143,8 @@ class LatestAssetsTest(AbstractPillarTest):
latest_assets = self.get(url).json['_items']
asset = latest_assets[0]
self.assertEquals(str(ok_id), asset['_id'])
self.assertEquals('Just a node name', asset['name'])
self.assertEqual(str(ok_id), asset['_id'])
self.assertEqual('Just a node name', asset['name'])
self.assertNotIn('user', asset)
@ -299,7 +299,7 @@ class LatestCommentsTest(AbstractPillarTest):
latest_comments = self.get(url).json['_items']
comment = latest_comments[0]
self.assertEquals(str(ok_id), comment['_id'])
self.assertEquals('Comment', comment['name'])
self.assertEquals('एनिमेशन is animation in Hindi', comment['properties']['content'])
self.assertEquals('คนรักของผัดไทย', comment['user']['full_name'])
self.assertEqual(str(ok_id), comment['_id'])
self.assertEqual('Comment', comment['name'])
self.assertEqual('एनिमेशन is animation in Hindi', comment['properties']['content'])
self.assertEqual('คนรักของผัดไทย', comment['user']['full_name'])

8
tests/test_api/test_nodes.py
View File

@ -669,10 +669,10 @@ class TaggedNodesTest(AbstractPillarTest):
mock_utcnow.return_value = self.fake_now
url = flask.url_for('nodes_api.tagged', tag='एनिमेशन')
resp = self.get(url).json[0]
self.assertEquals('01:01:01', resp['properties']['duration'])
self.assertEquals('Unittest project', resp['project']['name'])
self.assertEquals('default-project', resp['project']['url'])
self.assertEquals('5m ago', resp['pretty_created'])
self.assertEqual('01:01:01', resp['properties']['duration'])
self.assertEqual('Unittest project', resp['project']['name'])
self.assertEqual('default-project', resp['project']['url'])
self.assertEqual('5m ago', resp['pretty_created'])
class NodesReferencedByProjectTest(AbstractPillarTest):

6
tests/test_api/test_notifications.py
View File

@ -140,10 +140,10 @@ class NotificationsTest(AbstractPillarTest):
'notifications.web': True,
}
subscriptions = list(subscriptions_col.find(lookup))
self.assertEquals(len(subscriptions), len(user_ids))
self.assertEqual(len(subscriptions), len(user_ids))
for s in subscriptions:
self.assertIn(s['user'], user_ids)
self.assertEquals(s['context_object_type'], 'node')
self.assertEqual(s['context_object_type'], 'node')
def assertNotSubscribed(self, node_id, user_id):
subscriptions_col = self.app.data.driver.db['activities-subscriptions']
@ -153,7 +153,7 @@ class NotificationsTest(AbstractPillarTest):
}
subscriptions = subscriptions_col.find(lookup)
for s in subscriptions:
self.assertNotEquals(s['user'], user_id)
self.assertNotEqual(s['user'], user_id)
def notification_for_object(self, node_id):
notifications_url = flask.url_for('notifications.index')

18
tests/test_api/test_search_queries_nodes.py
View File

@ -73,7 +73,7 @@ class TestSearchNodesGlobal(AbstractPillarTest):
**PAGE_1
}
self.assertEquals(expected, search.to_dict())
self.assertEqual(expected, search.to_dict())
def test_empty_query_page_2(self):
with self.app.app_context():
@ -88,7 +88,7 @@ class TestSearchNodesGlobal(AbstractPillarTest):
**page_2
}
self.assertEquals(expected, search.to_dict())
self.assertEqual(expected, search.to_dict())
def test_empty_query_with_terms(self):
with self.app.app_context():
@ -118,7 +118,7 @@ class TestSearchNodesGlobal(AbstractPillarTest):
**PAGE_1
}
self.assertEquals(expected, search.to_dict())
self.assertEqual(expected, search.to_dict())
def test_query(self):
with self.app.app_context():
@ -169,7 +169,7 @@ class TestSearchNodesGlobal(AbstractPillarTest):
**PAGE_1
}
self.assertEquals(expected, search.to_dict())
self.assertEqual(expected, search.to_dict())
class TestSearchNodesInProject(AbstractPillarTest):
@ -186,7 +186,7 @@ class TestSearchNodesInProject(AbstractPillarTest):
**PAGE_1
}
self.assertEquals(expected, search.to_dict())
self.assertEqual(expected, search.to_dict())
def test_empty_query_page_2(self):
with self.app.app_context():
@ -203,7 +203,7 @@ class TestSearchNodesInProject(AbstractPillarTest):
**page_2
}
self.assertEquals(expected, search.to_dict())
self.assertEqual(expected, search.to_dict())
def test_empty_query_with_terms(self):
with self.app.app_context():
@ -236,7 +236,7 @@ class TestSearchNodesInProject(AbstractPillarTest):
**page_2
}
self.assertEquals(expected, search.to_dict())
self.assertEqual(expected, search.to_dict())
def test_query(self):
with self.app.app_context():
@ -288,7 +288,7 @@ class TestSearchNodesInProject(AbstractPillarTest):
**PAGE_1
}
self.assertEquals(expected, search.to_dict())
self.assertEqual(expected, search.to_dict())
class TestSearchMultiNodes(AbstractPillarTest):
@ -332,4 +332,4 @@ class TestSearchMultiNodes(AbstractPillarTest):
second
]
self.assertEquals(expected, search.to_dict())
self.assertEqual(expected, search.to_dict())

14
tests/test_api/test_search_queries_users.py
View File

@ -48,7 +48,7 @@ class TestSearchUsers(AbstractPillarTest):
**AGGREGATIONS,
**PAGE_1
}
self.assertEquals(expected, search.to_dict())
self.assertEqual(expected, search.to_dict())
def test_query(self):
with self.app.app_context():
@ -95,7 +95,7 @@ class TestSearchUsers(AbstractPillarTest):
**AGGREGATIONS,
**PAGE_1
}
self.assertEquals(expected, search.to_dict())
self.assertEqual(expected, search.to_dict())
def test_email_query(self):
with self.app.app_context():
@ -150,7 +150,7 @@ class TestSearchUsers(AbstractPillarTest):
**AGGREGATIONS,
**PAGE_1
}
self.assertEquals(expected, search.to_dict())
self.assertEqual(expected, search.to_dict())
class TestSearchUsersAdmin(AbstractPillarTest):
@ -163,7 +163,7 @@ class TestSearchUsersAdmin(AbstractPillarTest):
**AGGREGATIONS,
**PAGE_1
}
self.assertEquals(expected, search.to_dict())
self.assertEqual(expected, search.to_dict())
def test_query(self):
with self.app.app_context():
@ -209,7 +209,7 @@ class TestSearchUsersAdmin(AbstractPillarTest):
**AGGREGATIONS,
**PAGE_1
}
self.assertEquals(expected, search.to_dict())
self.assertEqual(expected, search.to_dict())
def test_terms(self):
with self.app.app_context():
@ -228,7 +228,7 @@ class TestSearchUsersAdmin(AbstractPillarTest):
**AGGREGATIONS,
**PAGE_1
}
self.assertEquals(expected, search.to_dict())
self.assertEqual(expected, search.to_dict())
def test_object_id_query(self):
with self.app.app_context():
@ -282,4 +282,4 @@ class TestSearchUsersAdmin(AbstractPillarTest):
**AGGREGATIONS,
**PAGE_1
}
self.assertEquals(expected, search.to_dict())
self.assertEqual(expected, search.to_dict())

46
tests/test_api/test_timeline.py
View File

@ -47,18 +47,18 @@ class GlobalTimelineTest(AbstractPillarTest):
timeline = response['groups']
continue_from = response['continue_from']
self.assertEquals(1520229908.0, continue_from)
self.assertEquals(3, len(timeline))
self.assertEquals('Week 11, 2018', timeline[1]['label'])
self.assertEquals('Week 10, 2018', timeline[2]['label'])
self.assertEquals('Unittest project', timeline[0]['groups'][0]['label'])
self.assertEquals('Another Project', timeline[0]['groups'][1]['label'])
self.assertEquals('/p/default-project/', timeline[0]['groups'][0]['url'])
self.assertEquals('/p/another-url/', timeline[0]['groups'][1]['url'])
self.assertEqual(1520229908.0, continue_from)
self.assertEqual(3, len(timeline))
self.assertEqual('Week 11, 2018', timeline[1]['label'])
self.assertEqual('Week 10, 2018', timeline[2]['label'])
self.assertEqual('Unittest project', timeline[0]['groups'][0]['label'])
self.assertEqual('Another Project', timeline[0]['groups'][1]['label'])
self.assertEqual('/p/default-project/', timeline[0]['groups'][0]['url'])
self.assertEqual('/p/another-url/', timeline[0]['groups'][1]['url'])
# week 12
week = timeline[0]
self.assertEquals('Week 12, 2018', week['label'])
self.assertEqual('Week 12, 2018', week['label'])
proj_pid1 = week['groups'][0]
expected_post_ids = self.all_post_pid1_ids[0:2]
@ -74,7 +74,7 @@ class GlobalTimelineTest(AbstractPillarTest):
# week 11
week = timeline[1]
self.assertEquals('Week 11, 2018', week['label'])
self.assertEqual('Week 11, 2018', week['label'])
proj_pid1 = week['groups'][0]
expected_post_ids = self.all_post_pid1_ids[2:9]
@ -90,7 +90,7 @@ class GlobalTimelineTest(AbstractPillarTest):
# week 10
week = timeline[2]
self.assertEquals('Week 10, 2018', week['label'])
self.assertEqual('Week 10, 2018', week['label'])
proj_pid1 = week['groups'][0]
expected_post_ids = self.all_post_pid1_ids[9:16]
@ -111,16 +111,16 @@ class GlobalTimelineTest(AbstractPillarTest):
timeline = response['groups']
self.assertNotIn('continue_from', response)
self.assertEquals(2, len(timeline))
self.assertEquals('Week 9, 2018', timeline[0]['label'])
self.assertEquals('Week 8, 2018', timeline[1]['label'])
self.assertEquals('Unittest project', timeline[0]['groups'][0]['label'])
self.assertEquals('Another Project', timeline[0]['groups'][1]['label'])
self.assertEquals('/p/default-project/', timeline[0]['groups'][0]['url'])
self.assertEqual(2, len(timeline))
self.assertEqual('Week 9, 2018', timeline[0]['label'])
self.assertEqual('Week 8, 2018', timeline[1]['label'])
self.assertEqual('Unittest project', timeline[0]['groups'][0]['label'])
self.assertEqual('Another Project', timeline[0]['groups'][1]['label'])
self.assertEqual('/p/default-project/', timeline[0]['groups'][0]['url'])
# week 9
week = timeline[0]
self.assertEquals('Week 9, 2018', week['label'])
self.assertEqual('Week 9, 2018', week['label'])
proj_pid1 = week['groups'][0]
expected_post_ids = self.all_post_pid1_ids[16:23]
@ -136,7 +136,7 @@ class GlobalTimelineTest(AbstractPillarTest):
# week 8
week = timeline[1]
self.assertEquals('Week 8, 2018', week['label'])
self.assertEqual('Week 8, 2018', week['label'])
proj_pid1 = week['groups'][0]
expected_post_ids = self.all_post_pid1_ids[23:25]
@ -151,14 +151,14 @@ class GlobalTimelineTest(AbstractPillarTest):
expected_post_ids, expected_asset_ids)
def assertProjectEquals(self, proj, label, url, expected_post_ids, expected_asset_ids):
self.assertEquals(label, proj['label'])
self.assertEquals(url, proj['url'])
self.assertEqual(label, proj['label'])
self.assertEqual(url, proj['url'])
actual_ids = [n['_id'] for n in proj['items']['post']]
self.assertEquals(expected_post_ids, actual_ids)
self.assertEqual(expected_post_ids, actual_ids)
actual_ids = [n['_id'] for n in proj['items']['asset']]
self.assertEquals(expected_asset_ids, actual_ids)
self.assertEqual(expected_asset_ids, actual_ids)
def create_asset(self, pid, days, hours):
asset_node = {

16
tests/test_api/test_utils.py
View File

@ -218,11 +218,11 @@ class TestPrettyDuration(unittest.TestCase):
def test_formatting(self):
from pillar.api.utils import pretty_duration
pretty_duration(500)
self.assertEquals('00:00', pretty_duration(0))
self.assertEquals('00:15', pretty_duration(15))
self.assertEquals('01:05', pretty_duration(65))
self.assertEquals('42:53', pretty_duration(2573))
self.assertEquals('01:11:22', pretty_duration(4282))
self.assertEquals('01:41', pretty_duration(100.85))
self.assertEquals('25:00:00', pretty_duration(90000)) # More than a day
self.assertEquals('', pretty_duration(None))
self.assertEqual('00:00', pretty_duration(0))
self.assertEqual('00:15', pretty_duration(15))
self.assertEqual('01:05', pretty_duration(65))
self.assertEqual('42:53', pretty_duration(2573))
self.assertEqual('01:11:22', pretty_duration(4282))
self.assertEqual('01:41', pretty_duration(100.85))
self.assertEqual('25:00:00', pretty_duration(90000)) # More than a day
self.assertEqual('', pretty_duration(None))

6
tests/test_cli/test_maintenance.py
View File

@ -195,8 +195,8 @@ class ReconcileNodeDurationTest(AbstractPillarTest):
new_node = nodes_coll.find_one({'_id': nid})
orig_node = self.orig_nodes[nid]
self.assertNotEqual(orig_node['_etag'], new_node['_etag'])
self.assertEquals(self.fake_now, new_node['_updated'])
self.assertEquals(duration_seconds, new_node['properties']['duration_seconds'])
self.assertEqual(self.fake_now, new_node['_updated'])
self.assertEqual(duration_seconds, new_node['properties']['duration_seconds'])
def assertAllUnchanged(self):
self.assertUnChanged(*self.orig_nodes.keys())
@ -206,7 +206,7 @@ class ReconcileNodeDurationTest(AbstractPillarTest):
for nid in node_ids:
new_node = nodes_coll.find_one({'_id': nid})
orig_node = self.orig_nodes[nid]
self.assertEquals(orig_node, new_node)
self.assertEqual(orig_node, new_node)
def _create_video_node(self, file_duration=None, node_duration=None, include_file=True):
file_id, _ = self.ensure_file_exists(file_overrides={