Launchpad itself

Merge ~cjwatson/launchpad:py3-json-model-view-dict-ordering into launchpad:master

  1. Git
  2. lp:~cjwatson/launchpad
  3. py3-json-model-view-dict-ordering
  4. Merge into master
Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: 9516f7bc40ea52e2b2da81e73ab084791cd89b4f
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/launchpad:py3-json-model-view-dict-ordering
Merge into: launchpad:master
Diff against target: 13 lines (+1/-1)
1 file modified
lib/lp/services/webapp/tests/test_view_model.py (+1/-1)
Reviewer Review Type Date Requested Status
Tom Wardill (community) Approve
Review via email: mp+399175@code.launchpad.net

Commit message

Fix TestJsonModelView for different dict ordering in Python 3

To post a comment you must log in.
Revision history for this message
Tom Wardill (twom) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/lib/lp/services/webapp/tests/test_view_model.py b/lib/lp/services/webapp/tests/test_view_model.py
2index e8e4478..1246dde 100644
3--- a/lib/lp/services/webapp/tests/test_view_model.py
4+++ b/lib/lp/services/webapp/tests/test_view_model.py
5@@ -123,7 +123,7 @@ class TestJsonModelView(BrowserTestCase):
6 self.configZCML()
7 browser = self.getUserBrowser(self.url)
8 cache = loads(browser.contents)
9- self.assertEqual(['related_features', 'context'], list(cache))
10+ self.assertThat(cache, KeysEqual('related_features', 'context'))
11
12 def test_JsonModel_custom_cache(self):
13 # Adding an item to the cache in the initialize method results in it

Subscribers

People subscribed via source and target branches

to status/vote changes: