Launchpad itself

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

  1. more-direct-delivery-pls
  2. Merge into devel
Proposed by Michael Hudson-Doyle
Status: Merged
Approved by: Michael Hudson-Doyle
Approved revision: no longer in the source branch.
Merged at revision: not available
Proposed branch: lp:~mwhudson/launchpad/more-direct-delivery-pls
Merge into: lp:launchpad
Diff against target: 76 lines (+24/-7)
4 files modified
Makefile (+4/-1)
lib/canonical/launchpad/scripts/__init__.py (+8/-6)
lib/devscripts/ec2test/testrunner.py (+4/-0)
script-testing.zcml (+8/-0)
To merge this branch: bzr merge lp:~mwhudson/launchpad/more-direct-delivery-pls
Reviewer Review Type Date Requested Status
Francis J. Lacoste (community) Approve
Review via email: mp+21685@code.launchpad.net

Commit message

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

Description of the change

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

Cheers,
mwh

To post a comment you must log in.
Revision history for this message
Francis J. Lacoste (flacoste) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'Makefile'
--- Makefile 2010-03-15 17:46:45 +0000
+++ Makefile 2010-03-18 22:30:44 +0000
@@ -337,7 +337,6 @@
337 /var/tmp/codehosting.test \337 /var/tmp/codehosting.test \
338 /var/tmp/codeimport \338 /var/tmp/codeimport \
339 /var/tmp/fatsam.appserver \339 /var/tmp/fatsam.appserver \
340 /var/tmp/launchpad_mailqueue \
341 /var/tmp/lperr \340 /var/tmp/lperr \
342 /var/tmp/lperr.test \341 /var/tmp/lperr.test \
343 /var/tmp/mailman \342 /var/tmp/mailman \
@@ -345,6 +344,10 @@
345 /var/tmp/ppa \344 /var/tmp/ppa \
346 /var/tmp/ppa.test \345 /var/tmp/ppa.test \
347 /var/tmp/zeca346 /var/tmp/zeca
347 # /var/tmp/launchpad_mailqueue is created read-only on ec2test
348 # instances.
349 if [ -w /var/tmp/launchpad_mailqueue ]; then $(RM) -rf /var/tmp/launchpad_mailqueue; fi
350
348351
349realclean: clean352realclean: clean
350 $(RM) TAGS tags353 $(RM) TAGS tags
351354
=== 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 @@
105 Instead, your test should use the Zopeless layer.105 Instead, your test should use the Zopeless layer.
106 """106 """
107107
108 scriptzcmlfilename = os.path.normpath(108 if config.instance_name == 'testrunner':
109 os.path.join(os.path.dirname(__file__),109 scriptzcmlfilename = 'script-testing.zcml'
110 os.pardir, os.pardir, os.pardir, os.pardir,110 else:
111 'script.zcml'))111 scriptzcmlfilename = 'script.zcml'
112112
113 scriptzcmlfilename = os.path.abspath(scriptzcmlfilename)113 scriptzcmlfilename = os.path.abspath(
114 os.path.join(config.root, scriptzcmlfilename))
115
114 from zope.configuration import xmlconfig116 from zope.configuration import xmlconfig
115117
116 # Hook up custom component architecture calls118 # Hook up custom component architecture calls
117119
=== 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 @@
400 '-p/var/launchpad/tmp -t/var/launchpad/test'),400 '-p/var/launchpad/tmp -t/var/launchpad/test'),
401 # set up database401 # set up database
402 p('/var/launchpad/test/utilities/launchpad-database-setup $USER')402 p('/var/launchpad/test/utilities/launchpad-database-setup $USER')
403 p('mkdir -p /var/tmp/launchpad_mailqueue/cur')
404 p('mkdir -p /var/tmp/launchpad_mailqueue/new')
405 p('mkdir -p /var/tmp/launchpad_mailqueue/tmp')
406 p('chmod -R a-w /var/tmp/launchpad_mailqueue/')
403 # close ssh connection407 # close ssh connection
404 user_connection.close()408 user_connection.close()
405409
406410
=== 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 @@
1<!-- Copyright 2010 Canonical Ltd. This software is licensed under the
2 GNU Affero General Public License version 3 (see the file LICENSE).
3-->
4
5<configure xmlns="http://namespaces.zope.org/zope">
6 <include file="script.zcml" />
7 <includeOverrides files="package-includes/*-configure-testing.zcml" />
8</configure>