Merge lp:~mwhudson/launchpad/build-after-headless into lp:launchpad

[Michael Hudson-Doyle]

[Michael Hudson-Doyle (mwhudson)]

This branch moves "make build" and "make schema" steps after the point where ec2test --headless lets go. Testing shows an improvement from about 15 minutes to about 8 and a half before ec2test --headless exits -- way more than I was expecting!

[Jonathan Lange (jml)]

This is a very nice improvement. I'm a little unsure of the quoting semantics with 'make', which I discussed with you on IRC.

If they are all good, please land this branch. If not, fix them and land it :)

review: Approve

=== modified file 'lib/devscripts/ec2test/ec2test-remote.py'
--- lib/devscripts/ec2test/ec2test-remote.py	2009-09-11 04:21:55 +0000
+++ lib/devscripts/ec2test/ec2test-remote.py	2009-09-14 22:59:32 +0000
@@ -11,7 +11,6 @@
 import os
 import pickle
 import re
-import shutil
 import subprocess
 import sys
 import textwrap
@@ -35,14 +34,9 @@
         self.public_branch = public_branch
         self.public_branch_revno = public_branch_revno
 
-        # Set up the user-supplied and default testrunner options.
-        if isinstance(test_options, basestring):
-            test_options = test_options.split()
-        elif test_options is None:
-            test_options = ['-vv']
-        else:
-            # Use whatever the user passed in.
-            pass
+        # Set up the testrunner options.
+        if test_options is None:
+            test_options = '-vv'
         self.test_options = test_options
 
         # Configure paths.
@@ -190,8 +184,7 @@
 
     def build_test_command(self):
         """See BaseTestRunner.build_test_command()."""
-        command = ['bin/py', '-t', 'test_on_merge.py']
-        command.extend(self.test_options)
+        command = ['make', 'check', 'VERBOSITY=' + self.test_options]
         return command
 
     # Used to filter lines in the summary log. See
@@ -454,7 +447,7 @@
        pqm_message,
        options.public_branch,
        options.public_branch_revno,
-       args
+       ' '.join(args)
     )
 
     try:

=== modified file 'lib/devscripts/ec2test/testrunner.py'
--- lib/devscripts/ec2test/testrunner.py	2009-09-14 03:36:00 +0000
+++ lib/devscripts/ec2test/testrunner.py	2009-09-14 22:59:32 +0000
@@ -483,8 +483,6 @@
           '-p/var/launchpad/tmp -t/var/launchpad/test'),
         # set up database
         p('/var/launchpad/test/utilities/launchpad-database-setup %(USER)s')
-        p('cd /var/launchpad/test && make build')
-        p('cd /var/launchpad/test && make schema')
         # close ssh connection
         user_connection.close()