From e522920d492231bbdbb7eb343055082d1e9c8fd5 Mon Sep 17 00:00:00 2001 From: holger krekel Date: Fri, 22 Nov 2019 12:51:50 +0100 Subject: [PATCH] fix the check for not installing bindings (used from CI), and refined rerun policy --- python/install_python_bindings.py | 2 +- python/tox.ini | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/python/install_python_bindings.py b/python/install_python_bindings.py index ee891193f..665f72e45 100755 --- a/python/install_python_bindings.py +++ b/python/install_python_bindings.py @@ -25,7 +25,7 @@ if __name__ == "__main__": ]) subprocess.check_call("rm -rf build/ src/deltachat/*.so" , shell=True) - if len(sys.argv) > 1 and sys.argv[1] != "onlybuild": + if len(sys.argv) <= 1 or sys.argv[1] != "onlybuild": subprocess.check_call([ sys.executable, "-m", "pip", "install", "-e", "." ]) diff --git a/python/tox.ini b/python/tox.ini index d882efff8..05bb7043f 100644 --- a/python/tox.ini +++ b/python/tox.ini @@ -10,8 +10,8 @@ commands = # (some qr tests are pretty heavy in terms of send/received # messages and async-imap's likely has concurrency problems, # eg https://github.com/async-email/async-imap/issues/4 ) - pytest -n6 -v -rsXx -k "not qr" {posargs:tests} - pytest -n6 -v -rsXx -k "qr" {posargs:tests} + pytest -n6 --reruns 3 --reruns-delay 5 -v -rsXx -k "not qr" {posargs:tests} + pytest -n6 --reruns 5 --reruns-delay 5 -v -rsXx -k "qr" {posargs:tests} # python tests/package_wheels.py {toxworkdir}/wheelhouse passenv = TRAVIS @@ -69,7 +69,7 @@ commands = [pytest] -addopts = -v -rs --reruns 3 --reruns-delay 2 +addopts = -v -rs python_files = tests/test_*.py norecursedirs = .tox xfail_strict=true