← 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: Martin Pool
  • Date: 2009-09-15 01:52:34 UTC
  • mfrom: (4685 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4689.
  • Revision ID: mbp@sourcefrog.net-20090915015234-lbvl4euj2z353zjl
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_breakin.py
127
127
                #       instead. Most notably, the WNOHANG isn't allowed, so
128
128
                #       this can hang indefinitely.
129
129
                pid_killed, returncode = os.waitpid(pid, opts)
130
 
                if (pid_killed, returncode) != (0, 0):
 
130
                if pid_killed != 0 and returncode != 0:
131
131
                    if sig is not None:
132
132
                        # high bit in low byte says if core was dumped; we
133
133
                        # don't care