Merge lp:~mwhudson/launchpad/more-direct-delivery-pls into lp:launchpad

[Michael Hudson-Doyle]

Force all zopeless mail delivery to be direct, have /var/tmp/launchpad_mailqueue be read-only in ec2 tests and reenable sampledata-setup.txt

Hi, as trailed on IRC this branch forces all delivery in zopeless mode to be direct.

Cheers,
mwh

[Francis J. Lacoste (flacoste)]

review: Approve

=== modified file 'Makefile'
--- Makefile	2010-03-15 17:46:45 +0000
+++ Makefile	2010-03-18 22:30:44 +0000
@@ -337,7 +337,6 @@
 			  /var/tmp/codehosting.test \
 			  /var/tmp/codeimport \
 			  /var/tmp/fatsam.appserver \
-			  /var/tmp/launchpad_mailqueue \
 			  /var/tmp/lperr \
 			  /var/tmp/lperr.test \
 			  /var/tmp/mailman \
@@ -345,6 +344,10 @@
 			  /var/tmp/ppa \
 			  /var/tmp/ppa.test \
 			  /var/tmp/zeca
+	# /var/tmp/launchpad_mailqueue is created read-only on ec2test
+	# instances.
+	if [ -w /var/tmp/launchpad_mailqueue ]; then $(RM) -rf /var/tmp/launchpad_mailqueue; fi
+
 
 realclean: clean
 	$(RM) TAGS tags

=== modified file 'lib/canonical/launchpad/scripts/__init__.py'
--- lib/canonical/launchpad/scripts/__init__.py	2009-10-20 22:13:21 +0000
+++ lib/canonical/launchpad/scripts/__init__.py	2010-03-18 22:30:44 +0000
@@ -105,12 +105,14 @@
             Instead, your test should use the Zopeless layer.
             """
 
-    scriptzcmlfilename = os.path.normpath(
-        os.path.join(os.path.dirname(__file__),
-                     os.pardir, os.pardir, os.pardir, os.pardir,
-                     'script.zcml'))
-
-    scriptzcmlfilename = os.path.abspath(scriptzcmlfilename)
+    if config.instance_name == 'testrunner':
+        scriptzcmlfilename = 'script-testing.zcml'
+    else:
+        scriptzcmlfilename = 'script.zcml'
+
+    scriptzcmlfilename = os.path.abspath(
+        os.path.join(config.root, scriptzcmlfilename))
+
     from zope.configuration import xmlconfig
 
     # Hook up custom component architecture calls

=== modified file 'lib/devscripts/ec2test/testrunner.py'
--- lib/devscripts/ec2test/testrunner.py	2010-03-18 10:42:32 +0000
+++ lib/devscripts/ec2test/testrunner.py	2010-03-18 22:30:44 +0000
@@ -400,6 +400,10 @@
           '-p/var/launchpad/tmp -t/var/launchpad/test'),
         # set up database
         p('/var/launchpad/test/utilities/launchpad-database-setup $USER')
+        p('mkdir -p /var/tmp/launchpad_mailqueue/cur')
+        p('mkdir -p /var/tmp/launchpad_mailqueue/new')
+        p('mkdir -p /var/tmp/launchpad_mailqueue/tmp')
+        p('chmod -R a-w /var/tmp/launchpad_mailqueue/')
         # close ssh connection
         user_connection.close()
 

=== renamed file 'lib/lp/soyuz/doc/sampledata-setup.txt.disabled' => 'lib/lp/soyuz/doc/sampledata-setup.txt'
=== added file 'script-testing.zcml'
--- script-testing.zcml	1970-01-01 00:00:00 +0000
+++ script-testing.zcml	2010-03-18 22:30:44 +0000
@@ -0,0 +1,8 @@
+<!-- Copyright 2010 Canonical Ltd.  This software is licensed under the
+     GNU Affero General Public License version 3 (see the file LICENSE).
+-->
+
+<configure xmlns="http://namespaces.zope.org/zope">
+    <include file="script.zcml" />
+    <includeOverrides files="package-includes/*-configure-testing.zcml" />
+</configure>