← Back to branch summary

~launchpad-pqm/launchpad/devel

« back to all changes in this revision

Viewing changes to test_on_merge.py

  • Committer: Gary Poster
  • Date: 2009-05-01 00:25:52 UTC
  • mto: (8329.1.1 buildout2)
  • mto: This revision was merged to the branch mainline in revision 8489.
  • Revision ID: gary.poster@canonical.com-20090501002552-3hdbl9k771juuy1z
test works, nominally; and bin/py is a bit more functional.  problems with import warnings are more serious because they cause tests to fail.

Show diffs side-by-side

added added

removed removed

Lines of Context:
test_on_merge.py
21
21
TIMEOUT = 60 * 15
22
22
 
23
23
def main():
24
 
    """Call test.py with whatever arguments this script was run with.
 
24
    """Call bin/test with whatever arguments this script was run with.
25
25
 
26
26
    If the tests ran ok (last line of stderr is 'OK<return>') then suppress
27
27
    output and exit(0).
134
134
 
135
135
    print 'Running tests.'
136
136
    os.chdir(here)
137
 
    cmd = [sys.executable, 'test.py'] + sys.argv[1:]
 
137
    cmd = [os.path.join(here, 'bin', 'test')] + sys.argv[1:]
138
138
    print ' '.join(cmd)
139
139
 
140
140
    # Run the test suite and return the error code
181
181
def killem(pid, signal):
182
182
    """Kill the process group leader identified by pid and other group members
183
183
 
184
 
    Note that test.py sets its process to a process group leader.
 
184
    Note that bin/test sets its process to a process group leader.
185
185
    """
186
186
    try:
187
187
        os.killpg(os.getpgid(pid), signal)