MAAS

Merge lp:~allenap/maas/dupe-get-time-configuration-scenario-name into lp:~maas-committers/maas/trunk

  1. dupe-get-time-configuration-scenario-name
  2. Merge into trunk
Proposed by Gavin Panella
Status: Merged
Approved by: Gavin Panella
Approved revision: no longer in the source branch.
Merged at revision: 5610
Proposed branch: lp:~allenap/maas/dupe-get-time-configuration-scenario-name
Merge into: lp:~maas-committers/maas/trunk
Diff against target: 12 lines (+1/-1)
1 file modified
src/maasserver/rpc/tests/test_nodes.py (+1/-1)
To merge this branch: bzr merge lp:~allenap/maas/dupe-get-time-configuration-scenario-name
Reviewer Review Type Date Requested Status
Gavin Panella (community) Approve
Review via email: mp+313312@code.launchpad.net

Commit message

Fix duplicate scenario name in tests for get_time_configuration.

To post a comment you must log in.
Revision history for this message
Gavin Panella (allenap) wrote :

Trivial, so self-reviewing.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/maasserver/rpc/tests/test_nodes.py'
2--- src/maasserver/rpc/tests/test_nodes.py 2016-12-07 12:46:14 +0000
3+++ src/maasserver/rpc/tests/test_nodes.py 2016-12-15 08:05:15 +0000
4@@ -579,7 +579,7 @@
5 ("machine", dict(
6 node_type=NODE_TYPE.MACHINE,
7 )),
8- ("machine", dict(
9+ ("device", dict(
10 node_type=NODE_TYPE.DEVICE,
11 )),
12 )