Merge lp:~jtv/maas/test-before-landing-bitch into lp:maas/trunk

[Jeroen T. Vermeulen]

Fix test breakage, lint, and mis-formatted imports.

The NodeGroup branch broke our build. Not when you ran its tests in isolation, but definitely when you ran the whole test suite. The reason is that the NodeGroup test case was derived from maastesting.TestCase, which does not know about Django's database, rather than from maasserver.testing.TestCase.

There was also some lint, and the imports formatting tool had apparently not been run. Tsk, tsk.

Lessons to be learned:
 * Stop the proliferation of TestCase classes. If it must be a TestCase-derivative, give it an obvious name.
 * Always run “make check” on a branch before landing it.
 * A warning about this in the template for our python tests may help.
 * “make lint” and “./utilities/format-new-and-modified-imports” should be habits.

Jeroen

[Julian Edwards (julian-edwards)]

review: Approve

[Julian Edwards (julian-edwards)]

 * Stop the proliferation of TestCase classes. If it must be a TestCase-derivative, give it an obvious name.

For the love of $DEITY, YES YES YES.

=== modified file 'src/maasserver/testing/factory.py'
--- src/maasserver/testing/factory.py	2012-06-05 02:35:55 +0000
+++ src/maasserver/testing/factory.py	2012-06-05 08:15:52 +0000
@@ -28,11 +28,10 @@
     FileStorage,
     MACAddress,
     Node,
+    NODE_TRANSITIONS,
     NodeGroup,
-    NODE_TRANSITIONS,
     SSHKey,
     )
-from maasserver.models.nodegroup import NodeGroup
 from maasserver.testing import (
     get_data,
     reload_object,

=== modified file 'src/maasserver/tests/test_nodegroup.py'
--- src/maasserver/tests/test_nodegroup.py	2012-06-05 05:49:12 +0000
+++ src/maasserver/tests/test_nodegroup.py	2012-06-05 08:15:52 +0000
@@ -12,11 +12,10 @@
 __metaclass__ = type
 __all__ = []
 
+from maasserver.testing.factory import factory
+from maasserver.testing.testcase import TestCase
 from testtools.matchers import MatchesStructure
 
-from maasserver.testing.factory import factory
-from maastesting.testcase import TestCase
-
 
 class TestNodeGroup(TestCase):