← Back to branch summary

~launchpad-pqm/launchpad/devel

« back to all changes in this revision

Viewing changes to test_on_merge.py

  • Committer: Bjorn Tillenius
  • Date: 2010-01-05 15:24:57 UTC
  • mto: This revision was merged to the branch mainline in revision 10132.
  • Revision ID: bjorn@canonical.com-20100105152457-i8c5g48i2ene7znp
Use xvfb-run in test_on_merge.py

Show diffs side-by-side

added added

removed removed

Lines of Context:
test_on_merge.py
142
142
        '-s',
143
143
        "'-screen 0 1024x768x24'",
144
144
        os.path.join(here, 'bin', 'test')] + sys.argv[1:]
145
 
    print ' '.join(cmd)
 
145
    command_line = ' '.join(cmd)
 
146
    print command_line
146
147
 
147
148
    # Run the test suite and return the error code
148
149
    #return call(cmd)
149
150
 
150
 
    proc = Popen(cmd, stdin=PIPE, stdout=PIPE, stderr=STDOUT)
 
151
    proc = Popen(
 
152
        command_line, stdin=PIPE, stdout=PIPE, stderr=STDOUT, shell=True)
151
153
    proc.stdin.close()
152
154
 
153
155
    # Do proc.communicate(), but timeout if there's no activity on stdout or