Merge ~bjornt/maas:admin_can_change_power_type-intermittent into maas:master

[Björn Tillenius]

Fix test_PUT_admin_can_change_power_type intermittent failure.

If the power type is 'lxd', it fails, since it can't generate the certificate.

[MAAS Lander (maas-lander)]

UNIT TESTS
-b admin_can_change_power_type-intermittent lp:~bjornt/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: e6caed0ec13ea2af59ee900c2fa2b24c2fbcfbec

review: Approve

[Alberto Donato (ack)]

+1

review: Approve

diff --git a/src/maasserver/api/tests/test_machine.py b/src/maasserver/api/tests/test_machine.py
index 3e5de4b..c67d4a1 100644
--- a/src/maasserver/api/tests/test_machine.py
+++ b/src/maasserver/api/tests/test_machine.py
@@ -2087,8 +2087,8 @@ class TestMachineAPI(APITestCase.ForUser):
 
     def test_PUT_admin_can_change_power_type(self):
         self.become_admin()
-        original_power_type = factory.pick_power_type()
-        new_power_type = factory.pick_power_type(but_not=[original_power_type])
+        original_power_type = "ipmi"
+        new_power_type = "openbmc"
         machine = factory.make_Node(
             owner=self.user,
             power_type=original_power_type,
@@ -2107,8 +2107,8 @@ class TestMachineAPI(APITestCase.ForUser):
         self.assertEqual(new_power_type, reload_object(machine).power_type)
 
     def test_PUT_non_admin_cannot_change_power_type(self):
-        original_power_type = factory.pick_power_type()
-        new_power_type = factory.pick_power_type(but_not=[original_power_type])
+        original_power_type = "ipmi"
+        new_power_type = "openbmc"
         machine = factory.make_Node(
             owner=self.user, power_type=original_power_type
         )