← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/strace.py

  • Committer: Vincent Ladeuil
  • Date: 2007-07-02 11:07:10 UTC
  • mto: (2584.1.1 Aaron's integration)
  • mto: This revision was merged to the branch mainline in revision 2585.
  • Revision ID: v.ladeuil+lp@free.fr-20070702110710-jjzry7iv7hbqinrm
Fix #102019 by not asking strace to follow children forks during tests.

* bzrlib/tests/test_strace.py:
(TestStrace.test_strace_callable_is_called,
TestStrace.test_strace_callable_result,
TestStrace.test_strace_result_has_raw_log): Don't follow childrens
when calling strace to avoid random hanging.

* bzrlib/strace.py:
(strace): Provides a way do disable the strace '-f' option.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/strace.py
33
33
 
34
34
    :return: a tuple: function-result, a StraceResult.
35
35
    """
 
36
    # FIXME: strace is buggy
 
37
    # (https://bugs.launchpad.net/ubuntu/+source/strace/+bug/103133) and the
 
38
    # test suite hangs if the '-f' is given to strace *and* more than one
 
39
    # thread is running. The following allows the test suite to disable fork
 
40
    # following to work around the bug.  It's a bit dirty to pollute the kwargs
 
41
    # so we take a likely-to-be-unique name to avoid conflicts (*args and
 
42
    # *kwargs are related to 'function').
 
43
    follow_childrens = kwargs.pop('strace_follow_childrens', True)
36
44
    # capture strace output to a file
37
45
    log_file = tempfile.NamedTemporaryFile()
38
46
    log_file_fd = log_file.fileno()
39
47
    pid = os.getpid()
40
48
    # start strace
41
 
    proc = subprocess.Popen(['strace',
42
 
        '-f', '-r', '-tt', '-p', str(pid), '-o', log_file.name
43
 
        ],
44
 
        stdout=subprocess.PIPE,
45
 
        stderr=subprocess.STDOUT)
 
49
    strace_cmd = ['strace', '-r', '-tt', '-p', str(pid), '-o', log_file.name]
 
50
    if follow_childrens:
 
51
        strace_args.append('-f')
 
52
    proc = subprocess.Popen(strace_cmd,
 
53
                            stdout=subprocess.PIPE,
 
54
                            stderr=subprocess.STDOUT)
46
55
    # Wait for strace to attach
47
56
    attached_notice = proc.stdout.readline()
48
57
    # Run the function to strace