MAAS

Merge ~adam-collard/maas:no-assertItemsEqual-CLI into maas:master

  1. Git
  2. lp:~adam-collard/maas
  3. no-assertItemsEqual-CLI
  4. Merge into master
Proposed by Adam Collard
Status: Merged
Approved by: Adam Collard
Approved revision: ae845497bf33c17a2a7bf7b21beeb60b2110e754
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~adam-collard/maas:no-assertItemsEqual-CLI
Merge into: maas:master
Prerequisite: ~adam-collard/maas:no-unittest2
Diff against target: 22 lines (+2/-2)
1 file modified
src/maascli/tests/test_utils.py (+2/-2)
Reviewer Review Type Date Requested Status
MAAS Lander Approve
Alberto Donato (community) Approve
Review via email: mp+408560@code.launchpad.net

Commit message

Remove defunct assertItemsEqual in favour of bare assert ==

To post a comment you must log in.
Revision history for this message
Alberto Donato (ack) wrote :

+1

review: Approve
Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b no-assertItemsEqual-CLI lp:~adam-collard/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: ae845497bf33c17a2a7bf7b21beeb60b2110e754

review: Approve
Revision history for this message
MAAS Lander (maas-lander) wrote :

LANDING
-b no-assertItemsEqual-CLI lp:~adam-collard/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/10958/consoleText

Revision history for this message
Adam Collard (adam-collard) wrote :

jenkins: !test

Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b no-assertItemsEqual-CLI lp:~adam-collard/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: ae845497bf33c17a2a7bf7b21beeb60b2110e754

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/maascli/tests/test_utils.py b/src/maascli/tests/test_utils.py
2index f19d8fd..186064d 100644
3--- a/src/maascli/tests/test_utils.py
4+++ b/src/maascli/tests/test_utils.py
5@@ -94,7 +94,7 @@ class TestFunctions(MAASTestCase):
6 "James-BOND-007": "James-BOND-007",
7 }
8 observed = {name_in: utils.safe_name(name_in) for name_in in expected}
9- self.assertItemsEqual(expected.items(), observed.items())
10+ assert expected == observed
11
12 def test_safe_name_non_ASCII(self):
13 # safe_name will not break if passed a string with non-ASCII
14@@ -119,7 +119,7 @@ class TestFunctions(MAASTestCase):
15 name_in: utils.handler_command_name(name_in)
16 for name_in in expected
17 }
18- self.assertItemsEqual(expected.items(), observed.items())
19+ assert expected == observed
20
21 def test_handler_command_name_non_ASCII(self):
22 # handler_command_name will not break if passed a string with

Subscribers

People subscribed via source and target branches