MAAS

Merge ~adam-collard/maas:fix-flaky-lxd-admin-machine into maas:master

  1. Git
  2. lp:~adam-collard/maas
  3. fix-flaky-lxd-admin-machine
  4. Merge into master
Proposed by Adam Collard
Status: Merged
Approved by: Adam Collard
Approved revision: 53940c7bbd3efc37cf5560c982bdc1fc077acef9
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~adam-collard/maas:fix-flaky-lxd-admin-machine
Merge into: maas:master
Diff against target: 13 lines (+1/-1)
1 file modified
src/maasserver/forms/tests/test_machine.py (+1/-1)
Reviewer Review Type Date Requested Status
Alberto Donato (community) Approve
Review via email: mp+407673@code.launchpad.net

Commit message

Don't pick LXD for testing power_parameters skip

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

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/maasserver/forms/tests/test_machine.py b/src/maasserver/forms/tests/test_machine.py
2index 9815c40..c8e837f 100644
3--- a/src/maasserver/forms/tests/test_machine.py
4+++ b/src/maasserver/forms/tests/test_machine.py
5@@ -431,7 +431,7 @@ class TestAdminMachineForm(MAASServerTestCase):
6 def test_AdminMachineForm_changes_power_parameters_with_skip_check(self):
7 node = factory.make_Node(interface=True)
8 hostname = factory.make_string()
9- power_type = factory.pick_power_type()
10+ power_type = factory.pick_power_type(but_not=["lxd"])
11 power_parameters_field = factory.make_string()
12 arch = make_usable_architecture(self)
13 form = AdminMachineForm(

Subscribers

People subscribed via source and target branches