1
=== modified file 'test_on_merge.py'
2
--- test_on_merge.py	2010-08-10 21:27:56 +0000
3
+++ test_on_merge.py	2010-09-23 23:57:49 +0000
4
@@ -1,6 +1,6 @@
5
1
#!/usr/bin/python -S
1
#!/usr/bin/python -S
6
2
#
2
#
8
3
# Copyright 2009 Canonical Ltd.  This software is licensed under the
3
# Copyright 2009, 2010 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
5
5
11
6
"""Tests that get run automatically on a merge."""
6
"""Tests that get run automatically on a merge."""
12
@@ -13,7 +13,7 @@
13
13
import psycopg2
13
import psycopg2
14
14
from subprocess import Popen, PIPE, STDOUT
14
from subprocess import Popen, PIPE, STDOUT
15
15
from signal import SIGKILL, SIGTERM, SIGINT, SIGHUP
15
from signal import SIGKILL, SIGTERM, SIGINT, SIGHUP
17
16
from select import select
16
import select
18
17
17
19
18
18
20
19
# The TIMEOUT setting (expressed in seconds) affects how long a test will run
19
# The TIMEOUT setting (expressed in seconds) affects how long a test will run
21
@@ -164,7 +164,24 @@
22
164
    # Popen.communicate() with large data sets.
164
    # Popen.communicate() with large data sets.
23
165
    open_readers = set([xvfb_proc.stdout])
165
    open_readers = set([xvfb_proc.stdout])
24
166
    while open_readers:
166
    while open_readers:
26
167
        rlist, wlist, xlist = select(open_readers, [], [], TIMEOUT)
167
        # select() blocks for a long time and can easily fail with EINTR
27
168
        # <https://bugs.launchpad.net/launchpad/+bug/615740>.  Really we
28
169
        # should have EINTR protection across the whole script (other syscalls
29
170
        # might be interrupted) but this is the longest and most likely to
30
171
        # hit, and doing it perfectly in python has proved to be quite hard in
31
172
        # bzr. -- mbp 20100924
32
173
        while True:
33
174
            try:
34
175
                rlist, wlist, xlist = select.select(open_readers, [], [], TIMEOUT)
35
176
                break
36
177
            except select.error, e:
37
178
                # nb: select.error doesn't expose a named 'errno' attribute,
38
179
                # at least in python 2.6.5; see
39
180
                # <http://mail.python.org/pipermail/python-dev/2000-October/009671.html>
40
181
                if e[0] == errno.EINTR:
41
182
                    continue
42
183
                else:
43
184
                    raise
44
168
185
45
169
        if len(rlist) == 0:
186
        if len(rlist) == 0:
46
170
            # The select() statement timed out!
187
            # The select() statement timed out!
Status:	Merged
Approved by:	Michael Hudson-Doyle on 2010-09-24
Approved revision:	no longer in the source branch.
Merged at revision:	11635
Proposed branch:	lp:~mbp/launchpad/mbp-trivial
Merge into:	lp:launchpad
Diff against target:	46 lines (+20/-3) 1 file modified test_on_merge.py (+20/-3)
To merge this branch:	bzr merge lp:~mbp/launchpad/mbp-trivial
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Michael Hudson-Doyle		2010-09-23	Approve on 2010-09-24
Review via email: mp+36515@code.launchpad.net