1
=== renamed file 'utilities/retest.py' => 'buildout-templates/bin/retest.in'
2
--- utilities/retest.py	2009-09-25 20:28:53 +0000
3
+++ buildout-templates/bin/retest.in	2009-10-01 10:38:14 +0000
4
@@ -1,4 +1,4 @@
6
1
#!/usr/bin/env python
1
#!${buildout:executable}
7
2
#
2
#
8
3
# Copyright 2009 Canonical Ltd.  This software is licensed under the
3
# Copyright 2009 Canonical Ltd.  This software is licensed under the
9
4
# GNU Affero General Public License version 3 (see the file LICENSE).
4
# GNU Affero General Public License version 3 (see the file LICENSE).
10
@@ -7,23 +7,39 @@
11
7
Given an error report, run all of the failed tests again.
7
Given an error report, run all of the failed tests again.
12
8
8
13
9
For instance, it can be used in the following scenario:
9
For instance, it can be used in the following scenario:
18
10
% bin/test -vvm lp.registry | tee test.out
10
19
11
% # Oh nos!  Failures!
11
  % bin/test -vvm lp.registry | tee test.out
20
12
% # Fix tests.
12
  % # Oh nos!  Failures!
21
13
% utilities/retest.py test.out
13
  % # Fix tests.
22
14
  % bin/retest test.out
23
15
24
16
Or, when run without arguments (or if any argument is "-"), a test
25
17
report (or a part of) can be piped in, for example by pasting it:
26
18
27
19
  % bin/retest
28
20
  Tests with failures:
29
21
     lib/lp/registry/browser/tests/sourcepackage-views.txt
30
22
     lib/lp/registry/tests/../stories/product/xx-product-package-pages.txt
31
23
  Total: ... tests, 2 failures, 0 errors in ...
32
24
33
14
"""
25
"""
34
15
26
36
16
import subprocess
27
import fileinput
37
28
import os
38
29
import re
39
17
import sys
30
import sys
41
18
import re
31
from itertools import takewhile
42
19
from pprint import pprint
32
from pprint import pprint
43
20
33
44
21
34
45
35
# The test script for this branch.
46
36
TEST = '${buildout:directory}/bin/test'
47
37
48
22
# Regular expression to match numbered stories.
38
# Regular expression to match numbered stories.
49
23
STORY_RE = re.compile("(.*)/\d{2}-.*")
39
STORY_RE = re.compile("(.*)/\d{2}-.*")
50
24
40
51
25
41
53
26
def getTestName(test):
42
def get_test_name(test):
54
27
    """Get the test name of a failed test.
43
    """Get the test name of a failed test.
55
28
44
56
29
    If the test is part of a numbered story,
45
    If the test is part of a numbered story,
57
@@ -36,44 +52,45 @@
58
36
    return test
52
    return test
59
37
53
60
38
54
79
39
def extractTests(input_file):
55
def gen_test_lines(lines):
80
40
    """Get the set of tests to be run.
56
    def p_start(line):
81
41
57
        return line.startswith('Tests with failures:')
82
42
    Given a file object for a test summary report, find all of the tests to be
58
    def p_take(line):
83
43
    run.
59
        return not line.startswith('Total:')
84
44
    """
60
    lines = iter(lines)
85
45
    failed_tests = set()
61
    for line in lines:
86
46
    reading_tests = False
62
        if p_start(line):
87
47
    for line in input_file:
63
            for line in takewhile(p_take, lines):
88
48
        if line.startswith('Tests with failures:'):
64
                yield line
89
49
            reading_tests = True
65
90
50
            continue
66
91
51
        if reading_tests:
67
def gen_tests(test_lines):
92
52
            if line.startswith('Total:'):
68
    for test_line in test_lines:
93
53
                break
69
        yield get_test_name(test_line.strip())
94
54
            test = getTestName(line.strip())
70
95
55
            failed_tests.add(test)
71
96
56
    return failed_tests
72
def extract_tests(lines):
97
73
    return set(gen_tests(gen_test_lines(lines)))
98
57
74
99
58
75
100
59
def run_tests(tests):
76
def run_tests(tests):
101
60
    """Given a set of tests, run them as one group."""
77
    """Given a set of tests, run them as one group."""
102
61
    cmd = ['bin/test', '-vv']
103
62
    print "Running tests:"
78
    print "Running tests:"
105
63
    pprint(sorted(list(tests)))
79
    pprint(sorted(tests))
106
80
    args = ['-vv']
107
64
    for test in tests:
81
    for test in tests:
112
65
        cmd.append('-t')
82
        args.append('-t')
113
66
        cmd.append(test)
83
        args.append(test)
114
67
    p = subprocess.Popen(cmd)
84
    os.execl(TEST, TEST, *args)
111
68
    p.wait()
115
69
85
116
70
86
117
71
if __name__ == '__main__':
87
if __name__ == '__main__':
126
72
    try:
88
    tests = extract_tests(fileinput.input())
127
73
        log_file = sys.argv[1]
89
    if len(tests) >= 1:
128
74
    except IndexError:
90
        run_tests(tests)
129
75
        print "Usage: %s test_output_file" % (sys.argv[0])
91
    else:
130
76
        sys.exit(-1)
92
        sys.stdout.write(
131
77
    fd = open(log_file, 'r')
93
            "Error: no tests found\n"
132
78
    failed_tests = extractTests(fd)
94
            "Usage: %s [test_output_file|-] ...\n\n%s\n\n" % (
133
79
    run_tests(failed_tests)
95
                sys.argv[0], __doc__.strip()))
134
96
        sys.exit(1)
Status:	Merged
Approved by:	Gavin Panella on 2009-10-01
Approved revision:	no longer in the source branch.
Merged at revision:	not available
Proposed branch:	lp:~allenap/launchpad/more-retest
Merge into:	lp:launchpad
Diff against target:	134 lines 1 file modified buildout-templates/bin/retest.in (+57/-40)
To merge this branch:	bzr merge lp:~allenap/launchpad/more-retest
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Michael Nelson (community)	code	2009-10-01	Approve on 2009-10-01
Review via email: mp+12709@code.launchpad.net