summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordrebs <drebs@leap.se>2017-07-07 17:24:21 -0300
committerdrebs <drebs@leap.se>2017-07-08 07:47:58 -0300
commit36e4a396a2a7edcc05c41e739d8f24ec7945cd21 (patch)
treed1fa0c5245ad13b42fc9d123e44cdca30019a1c3
parent88d52a578d0d7b06e138820fc0df24ba5f22e0e1 (diff)
[benchmarks] skip some tests by default
-rw-r--r--testing/tests/benchmarks/test_resources.py3
-rw-r--r--testing/tests/benchmarks/test_sqlcipher.py2
-rw-r--r--testing/tox.ini2
3 files changed, 5 insertions, 2 deletions
diff --git a/testing/tests/benchmarks/test_resources.py b/testing/tests/benchmarks/test_resources.py
index 39169012..173edbd1 100644
--- a/testing/tests/benchmarks/test_resources.py
+++ b/testing/tests/benchmarks/test_resources.py
@@ -1,3 +1,4 @@
+import pytest
import random
import time
@@ -22,6 +23,7 @@ def bellardBig(n):
return pi
+@pytest.mark.skip(reason='not a real use case, used only for instrumentation')
def test_cpu_intensive(monitored_benchmark):
def _cpu_intensive():
@@ -34,6 +36,7 @@ def test_cpu_intensive(monitored_benchmark):
monitored_benchmark(_cpu_intensive)
+@pytest.mark.skip(reason='not a real use case, used only for instrumentation')
def test_memory_intensive(monitored_benchmark):
def _memory_intensive():
diff --git a/testing/tests/benchmarks/test_sqlcipher.py b/testing/tests/benchmarks/test_sqlcipher.py
index d300d931..762c850f 100644
--- a/testing/tests/benchmarks/test_sqlcipher.py
+++ b/testing/tests/benchmarks/test_sqlcipher.py
@@ -22,7 +22,7 @@ def build_test_sqlcipher_async_create(amount, size):
def build_test_sqlcipher_create(amount, size):
- @pytest.mark.synchronous
+ @pytest.mark.skip(reason="this test is lengthy and not a real use case")
@pytest.mark.benchmark(group="test_sqlcipher_create")
def test(soledad_client, monitored_benchmark, payload):
client = soledad_client()._dbsyncer
diff --git a/testing/tox.ini b/testing/tox.ini
index 6a6275f3..aba69cf6 100644
--- a/testing/tox.ini
+++ b/testing/tox.ini
@@ -78,7 +78,7 @@ commands =
pip install -I --install-option="--bundled" pysqlcipher
./check-pysqlcipher.py
# and only then run benchmark
- py.test --benchmark-only -m 'not synchronous' {posargs}
+ py.test --benchmark-only {posargs}
passenv = HOST_HOSTNAME
[testenv:code-check]