← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_breakin.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-09-28 04:21:52 UTC
  • mfrom: (4715.2.2 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20090928042152-wt2kv0l6almf1f0f
(robertc) Refactor test_breakin to not wait for 10 seconds but
        instead kill the child process more rapidly. (Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_breakin.py
41
41
 
42
42
    def setUp(self):
43
43
        super(TestBreakin, self).setUp()
44
 
        if breakin.determine_signal() is None:
45
 
            raise tests.TestSkipped('this platform is missing SIGQUIT'
46
 
                                    ' or SIGBREAK')
 
44
        self.requireFeature(tests.BreakinFeature)
47
45
        if sys.platform == 'win32':
48
 
            # Windows doesn't have os.kill, and we catch the SIGBREAK signal.
49
 
            # We trigger SIGBREAK via a Console api so we need ctypes to access
50
 
            # the function
51
 
            if not have_ctypes:
52
 
                raise tests.UnavailableFeature('ctypes')
53
46
            self._send_signal = self._send_signal_win32
54
47
        else:
55
48
            self._send_signal = self._send_signal_via_kill
61
54
            sig_num = signal.SIGKILL
62
55
        else:
63
56
            raise ValueError("unknown signal type: %s" % (sig_type,))
64
 
        os.kill(pid, sig_num)
 
57
        try:
 
58
            os.kill(pid, sig_num)
 
59
        except OSError, e:
 
60
            if e.errno != errno.ESRCH:
 
61
                raise
65
62
 
66
63
    def _send_signal_win32(self, pid, sig_type):
67
64
        """Send a 'signal' on Windows.
110
107
            raise tests.TestNotApplicable(
111
108
                '%s raises a popup on OSX' % self.id())
112
109
 
113
 
    def _wait_for_process(self, pid, sig=None):
 
110
    def _wait_for_process(self, pid, sig=None, count=100):
114
111
        # We don't know quite how long waiting for the process 'pid' will take,
115
112
        # but if it's more than 10s then it's probably not going to work.
116
 
        for i in range(100):
117
 
            time.sleep(0.1)
 
113
        for i in range(count):
118
114
            if sig is not None:
119
115
                self._send_signal(pid, sig)
120
116
            # Use WNOHANG to ensure we don't get blocked, doing so, we may
139
135
                    return True, None
140
136
                else:
141
137
                    raise
 
138
            if i + 1 != count:
 
139
                time.sleep(0.1)
142
140
 
143
141
        return False, None
144
142
 
161
159
        # os.read(proc.stderr.fileno())?
162
160
        err = proc.stderr.readline()
163
161
        self.assertContainsRe(err, r'entering debugger')
 
162
        # Try to shutdown cleanly;
164
163
        # Now that the debugger is entered, we can ask him to quit
165
164
        proc.stdin.write("q\n")
166
 
        # We wait a bit to let the child process handles our query and avoid
167
 
        # triggering deadlocks leading to hangs on multi-core hosts...
168
 
        dead, sig = self._wait_for_process(proc.pid)
 
165
        # But we don't really care if it doesn't.
 
166
        dead, sig = self._wait_for_process(proc.pid, count=3)
169
167
        if not dead:
170
 
            # The process didn't finish, let's kill it before reporting failure
171
 
            dead, sig = self._wait_for_process(proc.pid, 'kill')
172
 
            if dead:
173
 
                raise tests.KnownFailure(
174
 
                    "subprocess wasn't terminated, it had to be killed")
175
 
            else:
176
 
                self.fail("subprocess %d wasn't terminated by repeated SIGKILL",
 
168
            # The process didn't finish, let's kill it.
 
169
            dead, sig = self._wait_for_process(proc.pid, 'kill', count=10)
 
170
            if not dead:
 
171
                # process isn't gone, user will have to hunt it down and kill
 
172
                # it.
 
173
                self.fail("subprocess %d wasn't terminated by repeated SIGKILL" %
177
174
                          proc.pid)
178
175
 
179
176
    def test_breakin_harder(self):