Merge lp:~mars/launchpad/re-enable-windmill-ec2-suite into lp:launchpad

[Māris Fogels]

Re-enable the windmill test suite on ec2. Closes bug 570380.

Hi,

This branch re-enables the Windmill test suite on ec2 test runs. It also removes the now-duplicate ec2_check Makefile target.

Test command: ec2 test
Lint: None
Pre-implementation call with: no one

Maris

[Leonard Richardson (leonardr)]

Approved.

review: Approve

=== modified file 'Makefile'
--- Makefile	2010-05-27 14:33:18 +0000
+++ Makefile	2010-06-08 18:21:30 +0000
@@ -88,18 +88,6 @@
 	# database.
 	${PY} -t ./test_on_merge.py $(VERBOSITY) $(TESTOPTS)
 
-# A version of 'make check' that applies modifications specifically for the
-# ec2 environment.
-ec2_check: clean build
-        # XXX mars 2010-05-17 bug=570380
-        # Disable the windmill test suite to prevent the whole system from
-        # hanging.  See bug 570380.
-        #
-        # Yes, this is code duplication.  If you conceive of a better
-        # solution in a less heated moment, then please replace this!
-	${PY} -t ./test_on_merge.py $(VERBOSITY) $(TESTOPTS) \
-		--layer='!\(MailmanLayer\|WindmillLayer\)'
-
 jscheck: build
 	# Run all JavaScript integration tests.  The test runner takes care of
 	# setting up the test environment.

=== modified file 'lib/devscripts/ec2test/remote.py'
--- lib/devscripts/ec2test/remote.py	2010-05-17 18:24:44 +0000
+++ lib/devscripts/ec2test/remote.py	2010-06-08 18:21:30 +0000
@@ -277,7 +277,7 @@
 
     def build_test_command(self):
         """See BaseTestRunner.build_test_command()."""
-        command = ['make', 'ec2_check', 'TESTOPTS=' + self.test_options]
+        command = ['make', 'check', 'TESTOPTS=' + self.test_options]
         return command