Merge lp:~mars/launchpad/fix-ec2-mailmanlayer into lp:launchpad

Proposed by Māris Fogels
Status: Merged
Approved by: Gary Poster
Approved revision: no longer in the source branch.
Merged at revision: 10886
Proposed branch: lp:~mars/launchpad/fix-ec2-mailmanlayer
Merge into: lp:launchpad
Diff against target: 12 lines (+1/-1)
1 file modified
Makefile (+1/-1)
To merge this branch: bzr merge lp:~mars/launchpad/fix-ec2-mailmanlayer
Reviewer Review Type Date Requested Status
Gary Poster (community) Approve
Review via email: mp+25527@code.launchpad.net

Commit message

Explicitly disable the test suite MailmanLayer when the suite is run on ec2. Without this the MailmanLayer tests will fail and the suite will not pass.

Description of the change

Hi,

This branch explicitly disables the test suite MailmanLayer when the suite is run on ec2. Without this the MailmanLayer tests will fail and the suite will not pass.

bin/test would normally shut off the layer for us as a default argument to "--layer", but we overrode that by passing "--layer=WindmillLayer". Without the default argument we mustexplicitly disable both WindmillLayer and Mailman layer.

This branch has be verified with a full test suite run on ec2, the same as a developer would normally perform themselves.

Pre-implementation call with: BjornT
Tested:
  Locally: make ec2_check TESTOPTS='-t test_title_inline_edit'
  Remote: ec2 test

Maris

To post a comment you must log in.
Revision history for this message
Gary Poster (gary) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile'
2--- Makefile 2010-05-17 18:24:44 +0000
3+++ Makefile 2010-05-18 15:34:36 +0000
4@@ -99,7 +99,7 @@
5 # Yes, this is code duplication. If you conceive of a better
6 # solution in a less heated moment, then please replace this!
7 ${PY} -t ./test_on_merge.py $(VERBOSITY) $(TESTOPTS) \
8- --layer='!WindmillLayer'
9+ --layer='!\(MailmanLayer\|WindmillLayer\)'
10
11 jscheck: build
12 # Run all JavaScript integration tests. The test runner takes care of