/breezy/unstable

To get this branch, use:
bzr branch https://code.breezy-vcs.org/breezy/unstable

« back to all changes in this revision

Viewing changes to breezy/tests/test_strace.py

  • Committer: Jelmer Vernooij
  • Date: 2017-05-24 01:39:33 UTC
  • mfrom: (3815.3776.6)
  • Revision ID: jelmer@jelmer.uk-20170524013933-ir4y4tqtrsiz2ka2
New upstream snapshot.

Show diffs side-by-side

added added

removed removed

Lines of Context:
18
18
 
19
19
import threading
20
20
 
21
 
from bzrlib import (
 
21
from breezy import (
22
22
    strace,
23
23
    tests,
24
24
    )
25
 
from bzrlib.strace import strace_detailed, StraceResult
26
 
from bzrlib.tests.features import (
 
25
from breezy.strace import strace_detailed, StraceResult
 
26
from breezy.tests.features import (
27
27
    strace_feature,
28
28
    )
29
29
 
57
57
        """Run strace, but cope if it's not allowed"""
58
58
        try:
59
59
            return strace_detailed(*args, **kwargs)
60
 
        except strace.StraceError, e:
 
60
        except strace.StraceError as e:
61
61
            if e.err_messages.startswith(
62
62
                    "attach: ptrace(PTRACE_ATTACH, ...): Operation not permitted"):
63
63
                raise tests.TestSkipped("ptrace not permitted")