summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordrebs <drebs@leap.se>2017-04-26 13:22:26 +0200
committerdrebs <drebs@leap.se>2017-07-03 14:19:59 -0300
commit6a1459d51f7142ba8bf2c52d5e4e4b3fef55347b (patch)
tree5ab1191f978e883e678ef1bf49098077951eb183
parent4954cc67df3ff287b948f847c4cd842f333604cc (diff)
[test] Cherry pick tuned adbapi parameters before running tests.
-rw-r--r--.gitlab-ci.yml2
1 files changed, 2 insertions, 0 deletions
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