[gentoo-commits] proj/portage:master commit in: pym/portage/tests/util/futures/

[Zac Medico]

commit:     a6e9c7cf429741015e26b923c8036416cc6bff7d
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 22 16:19:27 2018 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Apr 22 16:24:37 2018 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=a6e9c7cf

test_iter_completed: fix SleepProcess._future_done cancel race

Fixes: a9e8ebaa6979 ("Add async_iter_completed for asyncio migration (bug 
591760)")

 pym/portage/tests/util/futures/test_iter_completed.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pym/portage/tests/util/futures/test_iter_completed.py 
b/pym/portage/tests/util/futures/test_iter_completed.py
index 1344523c6..b07146ed3 100644
--- a/pym/portage/tests/util/futures/test_iter_completed.py
+++ b/pym/portage/tests/util/futures/test_iter_completed.py
@@ -19,7 +19,8 @@ class SleepProcess(ForkProcess):
                ForkProcess._start(self)
 
        def _future_done(self, task):
-               self.future.set_result(self.seconds)
+               if not self.future.cancelled():
+                       self.future.set_result(self.seconds)
 
        def _run(self):
                time.sleep(self.seconds)