Merge lp:~jtv/maas/fix-broken-make_denormalised_mac into lp:~maas-committers/maas/trunk

[Jeroen T. Vermeulen]

Fix make_denormalised_mac. Its workaround for the case where a random upper-cased MAC was accidentally normalised was broken.

Now that normalise_mac also strips whitespace, the solution is simple: add some whitespace and the result will always be denormalised.

This is urgent and near-trivial, so I think I'll just self-approve it before it breaks more tests.

Jeroen

[Jeroen T. Vermeulen (jtv)]

Looks OK. Self-approving. Sorry to those who wanted the cheap karma.

review: Approve

=== modified file 'src/metadataserver/deployment/tests/test_maas_configure_interfaces.py'
--- src/metadataserver/deployment/tests/test_maas_configure_interfaces.py	2014-09-19 03:14:35 +0000
+++ src/metadataserver/deployment/tests/test_maas_configure_interfaces.py	2014-09-20 03:59:01 +0000
@@ -103,12 +103,7 @@
 
 def make_denormalised_mac():
     """Create a MAC address that is not in its normalised form."""
-    mac = factory.make_mac_address()
-    if mac.upper() == mac.lower():
-        # This is not denormalised.  Inject an upper-case letter to ensure
-        # that we get something denormalised.
-        mac[-1] = 'D'
-    return mac.upper()
+    return " %s " % factory.make_mac_address().upper()
 
 
 class TestSplitIPPair(MAASTestCase):