Merge lp:~allenap/maas/lamont--ipv6-bmc into lp:~maas-committers/maas/trunk

[Gavin Panella]

=== modified file 'src/provisioningserver/power/tests/test_power.py'
--- src/provisioningserver/power/tests/test_power.py	2016-09-23 07:04:39 +0000
+++ src/provisioningserver/power/tests/test_power.py	2016-09-23 07:04:39 +0000
@@ -5,6 +5,7 @@
 
 __all__ = []
 
+from operator import methodcaller
 import random
 import re
 from unittest.mock import ANY
@@ -17,7 +18,14 @@
 from provisioningserver import power
 from provisioningserver.rpc import region
 from provisioningserver.rpc.testing import MockClusterToRegionRPCFixture
-from testtools.matchers import Equals
+from testtools.matchers import (
+    AfterPreprocessing,
+    Equals,
+    Is,
+    MatchesAll,
+    MatchesDict,
+    Not,
+)
 
 
 class TestPowerHelpers(MAASTestCase):
@@ -146,10 +154,24 @@
                 'schema': 'http'}}),
     )
 
-    def test_make_ip_extractor(self):
-        actual = re.compile(power.schema.IP_EXTRACTOR_PATTERNS.URL).match(
-            self.val)
+    def get_expected_matcher(self):
         if self.expected is None:
-            self.assertEqual(self.expected, actual)
+            return Is(None)
         else:
-            self.assertItemsEqual(actual.groupdict(), self.expected)
+            expected = {
+                key: Equals(value)
+                for key, value in self.expected.items()
+            }
+            return MatchesAll(
+                Not(Is(None)),
+                AfterPreprocessing(
+                    methodcaller("groupdict"),
+                    MatchesDict(expected),
+                    annotate=False,
+                ),
+                first_only=True,
+            )
+
+    def test_make_ip_extractor(self):
+        actual = re.match(power.schema.IP_EXTRACTOR_PATTERNS.URL, self.val)
+        self.assertThat(actual, self.get_expected_matcher())