From 6a1459d51f7142ba8bf2c52d5e4e4b3fef55347b Mon Sep 17 00:00:00 2001 From: drebs Date: Wed, 26 Apr 2017 13:22:26 +0200 Subject: [test] Cherry pick tuned adbapi parameters before running tests. --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e19ba5d5..16106986 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -79,6 +79,8 @@ benchmark: - git remote add leap https://leap.se/git/soledad - git fetch leap - git checkout leap/master testing/tox.ini testing/tests/benchmarks/conftest.py testing/tests/conftest.py + # ensure larger timeout and more retries for async/concurrent sqlcipher access + - git cherry-pick a052c150ae1276f643e3b6e049e45571fe1a7b70 - git status - git show -s --pretty=fuller - cd testing -- cgit v1.2.3