launchpad-reviewers team mailing list archive

[Gavin Panella <gavin.panella@xxxxxxxxxxxxx>]

Gavin Panella has proposed merging lp:~allenap/maas/djangorecipe-to-zc into lp:maas.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~allenap/maas/djangorecipe-to-zc/+merge/93170

Stop using djangorecipe. It prevents us from seeing the different dependencies required for production and development/testing, and the test script it produces is hobbled (can't choose individual tests, other options are ignored).
-- 
https://code.launchpad.net/~allenap/maas/djangorecipe-to-zc/+merge/93170
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~allenap/maas/djangorecipe-to-zc into lp:maas.

=== modified file 'Makefile'
--- Makefile	2012-02-10 11:38:27 +0000
+++ Makefile	2012-02-15 10:09:01 +0000
@@ -12,10 +12,14 @@
 	$(PYTHON) bootstrap.py --distribute --setup-source distribute_setup.py
 	@touch --no-create $@  # Ensure it's newer than its dependencies.
 
-bin/maas bin/test.maas: bin/buildout buildout.cfg setup.py
+bin/maas: bin/buildout buildout.cfg setup.py
 	bin/buildout install maas
 	@touch --no-create $@
 
+bin/test.maas: bin/buildout buildout.cfg setup.py
+	bin/buildout install maas-test
+	@touch --no-create $@
+
 bin/twistd.pserv: bin/buildout buildout.cfg setup.py
 	bin/buildout install pserv
 	@touch --no-create $@
@@ -34,7 +38,7 @@
 
 bin/py bin/ipy: bin/buildout buildout.cfg setup.py
 	bin/buildout install repl
-	@touch --no-create $@
+	@touch --no-create bin/py bin/ipy
 
 dev-db:
 	utilities/maasdb start ./db/ disposable

=== modified file 'buildout.cfg'
--- buildout.cfg	2012-02-09 13:57:23 +0000
+++ buildout.cfg	2012-02-15 10:09:01 +0000
@@ -2,6 +2,7 @@
 parts =
   flake8
   maas
+  maas-test
   pserv
   pserv-test
   repl
@@ -29,13 +30,11 @@
   testtools
 
 [maas]
-recipe = djangorecipe
-settings = development
+recipe = zc.recipe.egg
 eggs =
-  ${testing:eggs}
   django
   django-debug-toolbar
-  django-nose
+  django-nose  # FIXME; should not need this here.
   django-piston
   docutils
   oauth
@@ -43,16 +42,31 @@
   oops-datedir-repo
   oops-wsgi
   psycopg2
-  rabbitfixture
   South
-project = maas
-projectegg = maas
-test =
-  maasserver
-  maastesting
-  metadataserver
-testrunner = test.maas
-extra-paths = ${common:extra-paths}
+entry-points =
+  maas=django.core.management:execute_from_command_line
+initialization =
+  from os import environ
+  environ.setdefault("DJANGO_SETTINGS_MODULE", "maas.development")
+scripts = maas
+extra-paths =
+  ${common:extra-paths}
+
+[maas-test]
+recipe = zc.recipe.egg
+eggs =
+  ${testing:eggs}
+  ${maas:eggs}
+  django-nose
+  rabbitfixture
+entry-points =
+  test.maas=django.core.management:execute_from_command_line
+initialization =
+  ${maas:initialization}
+  sys.argv[1:1] = ["test", "--where=src", "--exclude=^provisioningserver"]
+scripts = test.maas
+extra-paths =
+  ${maas:extra-paths}
 
 [pserv]
 recipe = zc.recipe.egg
@@ -77,7 +91,7 @@
 entry-points =
   test.pserv=nose.core:TestProgram
 initialization =
-  sys.argv[1:1] = ["--where", "src/provisioningserver"]
+  sys.argv[1:1] = ["--where=src/provisioningserver"]
 extra-paths = ${common:extra-paths}
 scripts =
   test.pserv

=== added file 'src/metadataserver/tests/__init__.py'