Merge lp:~allenap/maas/disable-test_get_hostname_ip_mapping_returns_domain_head_ips--bug-1575631 into lp:~maas-committers/maas/trunk

Proposed by Gavin Panella
Status: Merged
Merged at revision: 4963
Proposed branch: lp:~allenap/maas/disable-test_get_hostname_ip_mapping_returns_domain_head_ips--bug-1575631
Merge into: lp:~maas-committers/maas/trunk
Diff against target: 11 lines (+1/-0)
1 file modified
src/maasserver/models/tests/test_staticipaddress.py (+1/-0)
To merge this branch: bzr merge lp:~allenap/maas/disable-test_get_hostname_ip_mapping_returns_domain_head_ips--bug-1575631
Reviewer Review Type Date Requested Status
Gavin Panella (community) Approve
Review via email: mp+293098@code.launchpad.net

Commit message

Skip test_get_hostname_ip_mapping_returns_domain_head_ips; it fails spuriously.

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

I'm going to land this direct to trunk.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/maasserver/models/tests/test_staticipaddress.py'
2--- src/maasserver/models/tests/test_staticipaddress.py 2016-04-22 01:56:28 +0000
3+++ src/maasserver/models/tests/test_staticipaddress.py 2016-04-27 12:16:49 +0000
4@@ -737,6 +737,7 @@
5 self.assertEqual({node.fqdn: HostnameIPMapping(
6 node.system_id, 30, {phy_staticip.ip}, node.node_type)}, mapping)
7
8+ @skip("XXX: GavinPanella 2016-04-27 bug=1556188: Fails spuriously.")
9 def test_get_hostname_ip_mapping_returns_domain_head_ips(self):
10 parent = factory.make_Domain()
11 name = factory.make_name()