diff --git a/ci_scripts/run-python-test.sh b/ci_scripts/run-python-test.sh index e0739d007..cb2659cfa 100755 --- a/ci_scripts/run-python-test.sh +++ b/ci_scripts/run-python-test.sh @@ -23,10 +23,6 @@ rm -rf src/deltachat/__pycache__ export PYTHONDONTWRITEBYTECODE=1 # run python tests (tox invokes pytest to run tests in python/tests) -# we split out qr-tests run to minimize likelyness of flaky tests -# (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 ) tox -e lint,py37 unset DCC_PY_LIVECONFIG diff --git a/ci_scripts/run-rust-test.sh b/ci_scripts/run-rust-test.sh index e0d600c5e..bbfe17ff1 100755 --- a/ci_scripts/run-rust-test.sh +++ b/ci_scripts/run-rust-test.sh @@ -10,8 +10,7 @@ export OPT_RELEASE="--release ${OPT}" export OPT_FFI_RELEASE="--manifest-path=deltachat-ffi/Cargo.toml --release" # Select cargo command: use cross by default -# export CARGO_CMD=cross -export CARGO_CMD=cargo +export CARGO_CMD=cross # On Appveyor (windows) and Travis (x86_64-unknown-linux-gnu and apple) native targets we use cargo (no need to cross-compile): if [[ $TARGET = *"windows"* ]] || [[ $TARGET == "x86_64-unknown-linux-gnu" ]] || [[ $TARGET = *"apple"* ]]; then @@ -19,9 +18,9 @@ if [[ $TARGET = *"windows"* ]] || [[ $TARGET == "x86_64-unknown-linux-gnu" ]] || fi # Install cross if necessary: -#if [[ $CARGO_CMD == "cross" ]]; then -# cargo install --git https://github.com/dignifiedquire/cross --rev fix-tty --force -##fi +if [[ $CARGO_CMD == "cross" ]]; then + cargo install --git https://github.com/dignifiedquire/cross --rev fix-tty --force +fi # Make sure TARGET is installed when using cargo: if [[ $CARGO_CMD == "cargo" ]]; then diff --git a/python/tox.ini b/python/tox.ini index 3c7c93764..8351467eb 100644 --- a/python/tox.ini +++ b/python/tox.ini @@ -7,6 +7,9 @@ envlist = [testenv] 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} # python tests/package_wheels.py {toxworkdir}/wheelhouse