summaryrefslogtreecommitdiff
path: root/testing
diff options
context:
space:
mode:
authordrebs <drebs@leap.se>2017-04-18 10:47:44 +0200
committerdrebs <drebs@leap.se>2017-04-19 11:49:41 +0200
commitdfdbb358177fd664bdde0630ef50c91e184baf13 (patch)
treea482c2f5c5284b0332fa538bcabad8d7b7533dc3 /testing
parent0e9c6868ab53b408d18a9536d5f93e686967da8c (diff)
[test] avoid running sqlcipher synchonous tests when benchmarking
SQLCipher synchronous benchmark tests were introduced when we started developing benchmark tests to compare synchronous and asynchronous code. Synchronous access to sqlcipher database is not used in soledad, and those tests are much slower than asynchronous tests (more than 10 times using ssd drive), so we want to avoid running them on ci. This commit introduces a "synchronous" marker and avoid running tests markes as such in ci environment.
Diffstat (limited to 'testing')
-rw-r--r--testing/tests/benchmarks/test_sqlcipher.py1
-rw-r--r--testing/tox.ini2
2 files changed, 2 insertions, 1 deletions
diff --git a/testing/tests/benchmarks/test_sqlcipher.py b/testing/tests/benchmarks/test_sqlcipher.py
index 39c9e3ad..0cdda7e6 100644
--- a/testing/tests/benchmarks/test_sqlcipher.py
+++ b/testing/tests/benchmarks/test_sqlcipher.py
@@ -22,6 +22,7 @@ def build_test_sqlcipher_async_create(amount, size):
def build_test_sqlcipher_create(amount, size):
+ @pytest.mark.synchronous
@pytest.mark.benchmark(group="test_sqlcipher_create")
def test(soledad_client, benchmark, payload):
client = soledad_client()._dbsyncer
diff --git a/testing/tox.ini b/testing/tox.ini
index 31d72b88..7d38a16c 100644
--- a/testing/tox.ini
+++ b/testing/tox.ini
@@ -74,7 +74,7 @@ commands =
pip install --install-option="--bundled" pysqlcipher
./check-pysqlcipher.py
# and only then run benchmark
- py.test --benchmark-only {posargs}
+ py.test --benchmark-only -m 'not synchronous' {posargs}
passenv = HOST_HOSTNAME
[testenv:code-check]