← 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-05-25 16:27:27 UTC
  • mto: This revision was merged to the branch mainline in revision 11372.
  • Revision ID: maris.fogels@canonical.com-20100525162727-9eap3op6h2s10lp4
Nicer function name

Show diffs side-by-side

added added

removed removed

Lines of Context:
test_on_merge.py
184
184
                # The process we were watching died.
185
185
                break
186
186
 
187
 
            cleanup_hung_testrunner_process(xvfb_proc)
 
187
            cleanup_hung_testrunner(xvfb_proc)
188
188
            break
189
189
 
190
190
        if xvfb_proc.stdout in rlist:
207
207
    return rv
208
208
 
209
209
 
210
 
def cleanup_hung_testrunner_process(process):
 
210
def cleanup_hung_testrunner(process):
211
211
    """Kill and clean up the testrunner process and its children."""
212
212
    print
213
213
    print