launchpad-reviewers team mailing list archive
-
launchpad-reviewers team
-
Mailing list archive
-
Message #08872
[Merge] lp:~rvb/maas/bug-1013275 into lp:maas
Raphaël Badin has proposed merging lp:~rvb/maas/bug-1013275 into lp:maas.
Requested reviews:
Launchpad code reviewers (launchpad-reviewers)
Related bugs:
Bug #1013275 in MAAS: "NodeViewsTest.test_node_list_displays_sorted_list_of_nodes fails (test isolation problem)."
https://bugs.launchpad.net/maas/+bug/1013275
For more details, see:
https://code.launchpad.net/~rvb/maas/bug-1013275/+merge/110475
This branch fixes bug 1013275. I've used the wrong test case in test_preseed.py and the database wasn't cleared at the end of the test. D'oh!
--
https://code.launchpad.net/~rvb/maas/bug-1013275/+merge/110475
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~rvb/maas/bug-1013275 into lp:maas.
=== modified file 'src/maasserver/tests/test_preseed.py'
--- src/maasserver/tests/test_preseed.py 2012-06-14 16:17:27 +0000
+++ src/maasserver/tests/test_preseed.py 2012-06-15 07:12:34 +0000
@@ -17,7 +17,7 @@
split_subarch,
)
from maasserver.testing.factory import factory
-from maastesting.testcase import TestCase
+from maasserver.testing.testcase import TestCase
class TestPreseedUtilities(TestCase):
=== modified file 'src/maasserver/tests/test_views_nodes.py'
--- src/maasserver/tests/test_views_nodes.py 2012-06-14 17:05:59 +0000
+++ src/maasserver/tests/test_views_nodes.py 2012-06-15 07:12:34 +0000
@@ -65,10 +65,7 @@
node_link = reverse('node-view', args=[node.system_id])
self.assertIn(node_link, get_content_links(response))
- # XXX rvb 2012-06-14 bug=1013275 I've disabled this test temporarily.
- # There is an isolation problem here as this test is picking up 5
- # nodes from the database and only 3 nodes are created.
- def disabled_node_list_displays_sorted_list_of_nodes(self):
+ def test_node_list_displays_sorted_list_of_nodes(self):
# Nodes are sorted on the node list page, newest first.
nodes = [factory.make_node() for i in range(3)]
# Explicitely set node.created since all of these node will