Merge lp:~rvb/maas/bug-1013275 into lp:maas/trunk

[Raphaël Badin]

Fix test_node_list_displays_sorted_list_of_nodes spurious failure.

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!

[Jeroen T. Vermeulen (jtv)]

How I hate these failures! There ought to be something we can do to prevent this. Maybe we can start by changing templates/test_module.py so that it no longer suggests maastesting.testcase by default.

Jeroen

review: Approve

[lp:~rvb/maas/bug-1013275]

646. By Raphaël Badin on 2012-06-15

Update templates/test_module.py.

[Raphaël Badin (rvb)]

> How I hate these failures! There ought to be something we can do to prevent
> this. Maybe we can start by changing templates/test_module.py so that it no
> longer suggests maastesting.testcase by default.

I've updated the template, we use the DB in tests most of the times so it seems more logical to propose using maasserver.testing.testcase by default.

[Julian Edwards (julian-edwards)]

On Friday 15 June 2012 07:17:31 you wrote:
> Review: Approve
>
> How I hate these failures! There ought to be something we can do to prevent
> this. Maybe we can start by changing templates/test_module.py so that it
> no longer suggests maastesting.testcase by default.
>
>
> Jeroen

I have 2 more suggestions:

 1. Rename the test cases so that they are not all TestCase. Make their names
mean something.
 2. Make the non-DB test cases cause failures immediately if you try to access
the DB.

=== 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:23:21 +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:23:21 +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

=== modified file 'templates/test_module.py'
--- templates/test_module.py	2012-04-16 10:00:51 +0000
+++ templates/test_module.py	2012-06-15 07:23:21 +0000
@@ -12,7 +12,7 @@
 __metaclass__ = type
 __all__ = []
 
-from maastesting.testcase import TestCase
+from maasserver.testing.testcase import TestCase
 
 
 class TestSomething(TestCase):