MAAS

Merge lp:~allenap/maas/fix-some-deprecations-in-tests into lp:~maas-committers/maas/trunk

  1. fix-some-deprecations-in-tests
  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: 5521
Proposed branch: lp:~allenap/maas/fix-some-deprecations-in-tests
Merge into: lp:~maas-committers/maas/trunk
Diff against target: 26 lines (+2/-2)
2 files modified
src/maasserver/api/tests/test_machine.py (+1/-1)
src/maasserver/api/tests/test_nodes.py (+1/-1)
To merge this branch: bzr merge lp:~allenap/maas/fix-some-deprecations-in-tests
Reviewer Review Type Date Requested Status
Gavin Panella (community) Approve
Review via email: mp+309542@code.launchpad.net

Commit message

TestCase.skip is deprecated... so use skipTest instead.

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/maasserver/api/tests/test_machine.py'
2--- src/maasserver/api/tests/test_machine.py 2016-10-20 19:43:37 +0000
3+++ src/maasserver/api/tests/test_machine.py 2016-10-28 08:54:16 +0000
4@@ -1181,7 +1181,7 @@
5 (old_zone, new_name), (machine.zone, machine.hostname))
6
7 def test_PUT_clears_zone(self):
8- self.skip(
9+ self.skipTest(
10 "XXX: JeroenVermeulen 2013-12-11 bug=1259872: Clearing the "
11 "zone field does not work...")
12
13
14=== modified file 'src/maasserver/api/tests/test_machines.py'
15=== modified file 'src/maasserver/api/tests/test_nodes.py'
16--- src/maasserver/api/tests/test_nodes.py 2016-09-22 02:53:33 +0000
17+++ src/maasserver/api/tests/test_nodes.py 2016-10-28 08:54:16 +0000
18@@ -314,7 +314,7 @@
19
20 def test_GET_nodes_issues_constant_number_of_queries(self):
21 # XXX: GavinPanella 2014-10-03 bug=1377335
22- self.skip("Unreliable; something is causing varying counts.")
23+ self.skipTest("Unreliable; something is causing varying counts.")
24
25 nodegroup = factory.make_NodeGroup()
26 self.create_nodes(nodegroup, 10)