Merge lp:~rvb/maas/test-model-cleanup into lp:~maas-committers/maas/trunk

[Raphaël Badin]

Test model.py structure cleanup.

Tiny cleanup branch. I came across a tiny weirdness when working on something else: src/maasserver/testing/models.py contains the model class used in tests, therefore it should be in src/maasserver/testing/tests/ and not in src/maasserver/testing.

[Gavin Panella (allenap)]

review: Approve

=== renamed file 'src/maasserver/testing/models.py' => 'src/maasserver/testing/tests/models.py'
=== modified file 'src/maasserver/testing/tests/test_module.py'
--- src/maasserver/testing/tests/test_module.py	2012-04-27 12:38:18 +0000
+++ src/maasserver/testing/tests/test_module.py	2012-06-12 14:12:04 +0000
@@ -25,11 +25,11 @@
     reload_objects,
     )
 from maasserver.testing.factory import factory
-from maasserver.testing.models import TestModel
 from maasserver.testing.testcase import (
     TestCase,
     TestModelTestCase,
     )
+from maasserver.testing.tests.models import TestModel
 from provisioningserver.testing import fakeapi
 
 # Horrible kludge.  Works around a bug where delete() does not work on
@@ -82,7 +82,7 @@
 class TestHelpers(TestModelTestCase):
     """Test helper functions."""
 
-    app = 'maasserver.testing'
+    app = 'maasserver.testing.tests'
 
     def test_extract_redirect_extracts_redirect_location(self):
         url = factory.getRandomString()