← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_strace.py

  • Committer: Tarmac
  • Author(s): Vincent Ladeuil
  • Date: 2017-01-30 14:42:05 UTC
  • mfrom: (6620.1.1 trunk)
  • Revision ID: tarmac-20170130144205-r8fh2xpmiuxyozpv
Merge  2.7 into trunk including fix for bug #1657238 [r=vila]

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_strace.py
22
22
    strace,
23
23
    tests,
24
24
    )
25
 
from bzrlib.strace import StraceFeature, strace_detailed, StraceResult
 
25
from bzrlib.strace import strace_detailed, StraceResult
 
26
from bzrlib.tests.features import (
 
27
    strace_feature,
 
28
    )
26
29
 
27
30
 
28
31
class TestStrace(tests.TestCaseWithTransport):
29
32
 
30
 
    _test_needs_features = [StraceFeature]
 
33
    _test_needs_features = [strace_feature]
31
34
 
32
35
    def setUp(self):
33
36
        # NB: see http://pad.lv/626679 and
47
50
        # restriction.
48
51
        active = threading.activeCount()
49
52
        if active > 1: # There is always the main thread at least
50
 
            raise tests.KnownFailure(
 
53
            self.knownFailure(
51
54
                '%d active threads, bug #103133 needs to be fixed.' % active)
52
55
 
53
56
    def strace_detailed_or_skip(self, *args, **kwargs):