This is an archive of the discontinued LLVM Phabricator instance.

[LNT] Python 3 support: specify how to sort dict
ClosedPublic

Authored by thopre on Oct 12 2019, 3:44 PM.

Download Raw Diff

Details

Reviewers

cmatthews
hubert.reinterpretcast
kristof.beyls
leandron
PrzemekWirkus

Summary

To be able to compare 2 lists of dictionaries, test
server/ui/test_roundtrip.py calls sorted on those list so that they are
comparable. However no comparison function is given so it fails on
Python 3 because dictionary are not comparable. This commit adds a key
parameter to sort on the name key of these dictionaries.

Diff Detail

Build Status

Buildable 39480
Build 39498: arc lint + arc unit

Event Timeline

thopre created this revision.Oct 12 2019, 3:44 PM

thopre added a parent revision: D68919: [LNT] Python 3 support: import LNT report as text.Oct 12 2019, 3:45 PM

Harbormaster completed remote builds in B39480: Diff 224761.Oct 12 2019, 3:46 PM

thopre added a child revision: D68921: [LNT] Python 3 support: fix server/ui/statsTester.py test discovery.Oct 12 2019, 3:47 PM

thopre edited parent revisions, added: D68863: [LNT] Python 3 support: don't assume order of cmake args; removed: D68919: [LNT] Python 3 support: import LNT report as text.Oct 15 2019, 3:09 AM

thopre added reviewers: leandron, PrzemekWirkus.Dec 4 2019, 6:49 AM

cmatthews accepted this revision.Dec 4 2019, 11:36 AM

This revision is now accepted and ready to land.Dec 4 2019, 11:36 AM

thopre removed a child revision: D68921: [LNT] Python 3 support: fix server/ui/statsTester.py test discovery.Dec 5 2019, 4:07 AM

thopre edited parent revisions, added: D68802: [LNT] Python 3 support: fix writing report to tmp file; removed: D68863: [LNT] Python 3 support: don't assume order of cmake args.

thopre added a child revision: D68986: [LNT] Python 3 support: adapt XML parsing with extra entities.Dec 5 2019, 4:09 AM

thopre closed this revision.Dec 5 2019, 4:29 AM

Committed as 2c828b800c409e38c295722d5f761e39207161be

Revision Contents

Path

Size

tests/

server/

ui/

test_roundtrip.py

6 lines

Diff 224761

tests/server/ui/test_roundtrip.py

Show First 20 Lines • Show All 88 Lines • ▼ Show 20 Lines	def _compare_results(self, after_submit_run, before_submit_run):
before_submit_run['run']['order_id'] = an_id		before_submit_run['run']['order_id'] = an_id
after_submit_run['run']['order_id'] = an_id		after_submit_run['run']['order_id'] = an_id

self.assertEqual(list(before_submit_run.keys()), list(after_submit_run.keys()))		self.assertEqual(list(before_submit_run.keys()), list(after_submit_run.keys()))
# Machine and run will be dicts, compare them directly.		# Machine and run will be dicts, compare them directly.
for k in ['machine', 'run']:		for k in ['machine', 'run']:
self.assertEqual(before_submit_run[k], after_submit_run[k])		self.assertEqual(before_submit_run[k], after_submit_run[k])
# The order of the tests might have changed, so sort before they are compared.		# The order of the tests might have changed, so sort before they are compared.
before_submit_tests = sorted(before_submit_run['tests'])		before_submit_tests = sorted(before_submit_run['tests'],
after_submit_tests = sorted(after_submit_run['tests'])		key=lambda test: test['id'])
		after_submit_tests = sorted(after_submit_run['tests'],
		key=lambda test: test['id'])
for i, _ in enumerate(before_submit_tests):		for i, _ in enumerate(before_submit_tests):
before_submit_tests[i]['run_id'] = 1234		before_submit_tests[i]['run_id'] = 1234
after_submit_tests[i]['run_id'] = 1234		after_submit_tests[i]['run_id'] = 1234
before_submit_tests[i]['id'] = 1234		before_submit_tests[i]['id'] = 1234
after_submit_tests[i]['id'] = 1234		after_submit_tests[i]['id'] = 1234

self.assertEqual(before_submit_tests[i], after_submit_tests[i])		self.assertEqual(before_submit_tests[i], after_submit_tests[i])

Show All 21 Lines