5557.1.15
by John Arbash Meinel
Merge bzr.dev 5597 to resolve NEWS, aka bzr-2.3.txt |
1 |
# Copyright (C) 2007-2011 Canonical Ltd
|
2367.1.7
by Robert Collins
Added ``bzrlib.strace.strace`` which will strace a single callable and |
2 |
#
|
3 |
# This program is free software; you can redistribute it and/or modify
|
|
4 |
# it under the terms of the GNU General Public License as published by
|
|
5 |
# the Free Software Foundation; either version 2 of the License, or
|
|
6 |
# (at your option) any later version.
|
|
7 |
#
|
|
8 |
# This program is distributed in the hope that it will be useful,
|
|
9 |
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
10 |
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
11 |
# GNU General Public License for more details.
|
|
12 |
#
|
|
13 |
# You should have received a copy of the GNU General Public License
|
|
14 |
# along with this program; if not, write to the Free Software
|
|
4183.7.1
by Sabin Iacob
update FSF mailing address |
15 |
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
2367.1.7
by Robert Collins
Added ``bzrlib.strace.strace`` which will strace a single callable and |
16 |
|
17 |
"""Tests for the strace-invoking support."""
|
|
18 |
||
3406.1.2
by Vincent Ladeuil
Fix as per Robert's review. |
19 |
import threading |
2367.1.7
by Robert Collins
Added ``bzrlib.strace.strace`` which will strace a single callable and |
20 |
|
3406.1.1
by Vincent Ladeuil
Fix #226769 by disabling some strace tests. |
21 |
from bzrlib import ( |
5398.2.1
by Martin Pool
Cope with strace not allowing you to attach to your own processes |
22 |
strace, |
3406.1.1
by Vincent Ladeuil
Fix #226769 by disabling some strace tests. |
23 |
tests, |
24 |
)
|
|
5967.12.1
by Martin Pool
Move all test features into bzrlib.tests.features |
25 |
from bzrlib.strace import strace_detailed, StraceResult |
26 |
from bzrlib.tests.features import ( |
|
27 |
strace_feature, |
|
28 |
)
|
|
3406.1.1
by Vincent Ladeuil
Fix #226769 by disabling some strace tests. |
29 |
|
30 |
||
31 |
class TestStrace(tests.TestCaseWithTransport): |
|
2367.1.7
by Robert Collins
Added ``bzrlib.strace.strace`` which will strace a single callable and |
32 |
|
5967.12.1
by Martin Pool
Move all test features into bzrlib.tests.features |
33 |
_test_needs_features = [strace_feature] |
2367.1.7
by Robert Collins
Added ``bzrlib.strace.strace`` which will strace a single callable and |
34 |
|
5398.2.3
by Martin Pool
Just skip the strace tests |
35 |
def setUp(self): |
36 |
# NB: see http://pad.lv/626679 and
|
|
37 |
# <https://code.launchpad.net/~mbp/bzr/626679-strace/+merge/34157>:
|
|
38 |
# testing strace by connecting to ourselves has repeatedly caused
|
|
39 |
# hangs in running the test suite; these are fixable given enough
|
|
40 |
# determination but given that strace is not used by any other tests
|
|
41 |
# at the moment and that it's only test-support code, we just leave it
|
|
42 |
# untested -- mbp 20100901
|
|
43 |
raise tests.TestSkipped("strace selftests are broken and disabled") |
|
44 |
||
3406.1.2
by Vincent Ladeuil
Fix as per Robert's review. |
45 |
def _check_threads(self): |
3406.1.3
by Vincent Ladeuil
Fixed as par John's review. |
46 |
# For bug #226769, it was decided that the strace tests should not be
|
47 |
# run when more than one thread is active. A lot of tests are currently
|
|
48 |
# leaking threads for good or bad reasons, once they are fixed or
|
|
49 |
# strace itself is fixed (bug #103133), we can get rid of the
|
|
50 |
# restriction.
|
|
3406.1.2
by Vincent Ladeuil
Fix as per Robert's review. |
51 |
active = threading.activeCount() |
52 |
if active > 1: # There is always the main thread at least |
|
6050.1.2
by Martin
Make tests raising KnownFailure use the knownFailure method instead |
53 |
self.knownFailure( |
3406.1.2
by Vincent Ladeuil
Fix as per Robert's review. |
54 |
'%d active threads, bug #103133 needs to be fixed.' % active) |
3406.1.1
by Vincent Ladeuil
Fix #226769 by disabling some strace tests. |
55 |
|
5398.2.1
by Martin Pool
Cope with strace not allowing you to attach to your own processes |
56 |
def strace_detailed_or_skip(self, *args, **kwargs): |
57 |
"""Run strace, but cope if it's not allowed"""
|
|
58 |
try: |
|
59 |
return strace_detailed(*args, **kwargs) |
|
60 |
except strace.StraceError, e: |
|
61 |
if e.err_messages.startswith( |
|
62 |
"attach: ptrace(PTRACE_ATTACH, ...): Operation not permitted"): |
|
63 |
raise tests.TestSkipped("ptrace not permitted") |
|
64 |
else: |
|
65 |
raise
|
|
66 |
||
2367.1.7
by Robert Collins
Added ``bzrlib.strace.strace`` which will strace a single callable and |
67 |
def test_strace_callable_is_called(self): |
3406.1.2
by Vincent Ladeuil
Fix as per Robert's review. |
68 |
self._check_threads() |
69 |
||
2367.1.7
by Robert Collins
Added ``bzrlib.strace.strace`` which will strace a single callable and |
70 |
output = [] |
71 |
def function(positional, *args, **kwargs): |
|
72 |
output.append((positional, args, kwargs)) |
|
5398.2.1
by Martin Pool
Cope with strace not allowing you to attach to your own processes |
73 |
self.strace_detailed_or_skip( |
74 |
function, ["a", "b"], {"c": "c"}, |
|
75 |
follow_children=False) |
|
2367.1.7
by Robert Collins
Added ``bzrlib.strace.strace`` which will strace a single callable and |
76 |
self.assertEqual([("a", ("b",), {"c":"c"})], output) |
77 |
||
2367.1.9
by Robert Collins
Review feedback. |
78 |
def test_strace_callable_result(self): |
3406.1.2
by Vincent Ladeuil
Fix as per Robert's review. |
79 |
self._check_threads() |
3406.1.1
by Vincent Ladeuil
Fix #226769 by disabling some strace tests. |
80 |
|
2367.1.7
by Robert Collins
Added ``bzrlib.strace.strace`` which will strace a single callable and |
81 |
def function(): |
2367.1.9
by Robert Collins
Review feedback. |
82 |
return "foo" |
5398.2.1
by Martin Pool
Cope with strace not allowing you to attach to your own processes |
83 |
result, strace_result = self.strace_detailed_or_skip(function,[], {}, |
2566.3.4
by Vincent Ladeuil
Take Martin and Robert comments into account. |
84 |
follow_children=False) |
2367.1.9
by Robert Collins
Review feedback. |
85 |
self.assertEqual("foo", result) |
86 |
self.assertIsInstance(strace_result, StraceResult) |
|
2367.1.7
by Robert Collins
Added ``bzrlib.strace.strace`` which will strace a single callable and |
87 |
|
88 |
def test_strace_result_has_raw_log(self): |
|
89 |
"""Checks that a reasonable raw strace log was found by strace."""
|
|
3406.1.2
by Vincent Ladeuil
Fix as per Robert's review. |
90 |
self._check_threads() |
91 |
||
2367.1.7
by Robert Collins
Added ``bzrlib.strace.strace`` which will strace a single callable and |
92 |
def function(): |
93 |
self.build_tree(['myfile']) |
|
5398.2.1
by Martin Pool
Cope with strace not allowing you to attach to your own processes |
94 |
unused, result = self.strace_detailed_or_skip(function, [], {}, |
2566.3.4
by Vincent Ladeuil
Take Martin and Robert comments into account. |
95 |
follow_children=False) |
2367.1.7
by Robert Collins
Added ``bzrlib.strace.strace`` which will strace a single callable and |
96 |
self.assertContainsRe(result.raw_log, 'myfile') |