Merge lp:~allenap/maas/buildfallout into lp:~maas-committers/maas/trunk

[Gavin Panella]

Get txlongpoll and dns development services working again.

This is unanticipated fallout from recent changes to buildout.cfg to remove its responsibility for production dependencies. This fix ensures that maastesting is only tested with the common test eggs, and also works around a bug in buildout where it generated a script that attempted to update sys.path with an invalid list literal.

[Robie Basak (racb)]

I'm not familiar with buildout. But this was working last week, broke today, and I've verified that this fixes it.

review: Approve

=== modified file 'buildout.cfg'
--- buildout.cfg	2012-09-24 10:37:47 +0000
+++ buildout.cfg	2012-09-24 13:29:22 +0000
@@ -38,6 +38,7 @@
   nose-subunit
   postgresfixture
   python-subunit
+  rabbitfixture
   saucelabsfixture
   sst
   testresources
@@ -79,7 +80,6 @@
 recipe = zc.recipe.egg
 eggs =
   ${maas:eggs}
-  rabbitfixture
 entry-points =
   test.maas=django.core.management:execute_from_command_line
 initialization =
@@ -117,8 +117,7 @@
 [maastesting-test]
 recipe = zc.recipe.egg
 eggs =
-  ${maas:eggs}
-  rabbitfixture
+  ${common:test-eggs}
 entry-points =
   test.maastesting=nose.core:TestProgram
 initialization =
@@ -148,7 +147,6 @@
 eggs =
   ${pserv:eggs}
   ${common:test-eggs}
-  rabbitfixture
 entry-points =
   test.pserv=nose.core:TestProgram
 initialization =
@@ -189,5 +187,6 @@
 [txlongpoll]
 recipe = z3c.recipe.scripts
 eggs =
+extra-paths = /buildout/creates/an/invalid/list/literal/without/this
 entry-points = twistd.txlongpoll=twisted.scripts.twistd:run
 scripts = twistd.txlongpoll