← Back to branch summary

~launchpad-pqm/launchpad/devel

« back to all changes in this revision

Viewing changes to test_on_merge.py

  • Committer: Maris Fogels
  • Date: 2010-08-10 21:27:56 UTC
  • mto: This revision was merged to the branch mainline in revision 11372.
  • Revision ID: maris.fogels@canonical.com-20100810212756-1gxjn1n50gu3rrlb
Re-added the shell option to our subprocess call.  The script fails with strange errors if we do not include this option.

Show diffs side-by-side

added added

removed removed

Lines of Context:
test_on_merge.py
141
141
    # We run the test suite under a virtual frame buffer server so that the
142
142
    # JavaScript integration test suite can run.
143
143
    cmd = [
144
 
        'xvfb-run',
 
144
        '/usr/bin/xvfb-run',
145
145
        "--error-file=/var/tmp/xvfb-errors.log",
146
146
        "--server-args='-screen 0 1024x768x24'",
147
147
        os.path.join(HERE, 'bin', 'test')] + sys.argv[1:]
154
154
        command_line,
155
155
        stdout=PIPE,
156
156
        stderr=STDOUT,
157
 
        preexec_fn=os.setpgrp)
 
157
        preexec_fn=os.setpgrp,
 
158
        shell=True)
158
159
 
159
160
    # This code is very similar to what takes place in Popen._communicate(),
160
161
    # but this code times out if there is no activity on STDOUT for too long.