Rev 4677: Fix test_breakin failure. in file:///home/vila/src/bzr/bugs/freebsd-regressions/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/freebsd-regressions/

------------------------------------------------------------
revno: 4677
revision-id: v.ladeuil+lp at free.fr-20090907084147-3qejx7c6wx30u8lx
parent: pqm at pqm.ubuntu.com-20090907041459-so0m9vkp5j6mgir0
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: freebsd-regressions
timestamp: Mon 2009-09-07 10:41:47 +0200
message:
  Fix test_breakin failure.
  
  * bzrlib/tests/blackbox/test_breakin.py:
  (TestBreakin._wait_for_process): waitpid() on FreeBSD can return a
  bogus returncode if the pid returned is 0.
-------------- next part --------------
=== modified file 'bzrlib/tests/blackbox/test_breakin.py'
--- a/bzrlib/tests/blackbox/test_breakin.py	2009-07-31 14:56:55 +0000
+++ b/bzrlib/tests/blackbox/test_breakin.py	2009-09-07 08:41:47 +0000
@@ -127,7 +127,7 @@
                 #       instead. Most notably, the WNOHANG isn't allowed, so
                 #       this can hang indefinitely.
                 pid_killed, returncode = os.waitpid(pid, opts)
-                if (pid_killed, returncode) != (0, 0):
+                if pid_killed != 0 and returncode != 0:
                     if sig is not None:
                         # high bit in low byte says if core was dumped; we
                         # don't care