[test] rename benchmark tests directory and tag

9 files changed, 8 insertions, 8 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dd4e4605..d11a4d1e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -30,7 +30,7 @@ benchmark:
     - couchdb
   script:
     - cd testing
-    - tox -e perf -- --couch-url http://couchdb:5984
+    - tox -e benchmark -- --couch-url http://couchdb:5984
   tags:
     - docker
     - benchmark
diff --git a/testing/tests/perf/assets/cert_default.conf b/testing/tests/benchmarks/assets/cert_default.conf
index 8043cea3..8043cea3 100644
--- a/testing/tests/perf/assets/cert_default.conf
+++ b/testing/tests/benchmarks/assets/cert_default.conf
diff --git a/testing/tests/perf/conftest.py b/testing/tests/benchmarks/conftest.py
index a9cc3464..a9cc3464 100644
--- a/testing/tests/perf/conftest.py
+++ b/testing/tests/benchmarks/conftest.py
diff --git a/testing/tests/perf/pytest.ini b/testing/tests/benchmarks/pytest.ini
index 7a0508ce..7a0508ce 100644
--- a/testing/tests/perf/pytest.ini
+++ b/testing/tests/benchmarks/pytest.ini
diff --git a/testing/tests/perf/test_crypto.py b/testing/tests/benchmarks/test_crypto.py
index a438ee49..ab586bea 100644
--- a/testing/tests/perf/test_crypto.py
+++ b/testing/tests/benchmarks/test_crypto.py
@@ -18,7 +18,7 @@ from leap.soledad.client import _crypto
 LIMIT = int(float(os.environ.get('SIZE_LIMIT', 50 * 1000 * 1000)))
 
 
-pytestmark = pytest.mark.perf
+pytestmark = pytest.mark.benchmark
 
 
 def create_doc_encryption(size):
diff --git a/testing/tests/perf/test_misc.py b/testing/tests/benchmarks/test_misc.py
index b45dc04e..2f32ad7c 100644
--- a/testing/tests/perf/test_misc.py
+++ b/testing/tests/benchmarks/test_misc.py
@@ -1,6 +1,6 @@
 import pytest
 
-pytestmark = pytest.mark.perf
+pytestmark = pytest.mark.benchmark
 
 
 @pytest.mark.benchmark(group="test_instance")
diff --git a/testing/tests/perf/test_sqlcipher.py b/testing/tests/benchmarks/test_sqlcipher.py
index 807af6e9..7f8842bd 100644
--- a/testing/tests/perf/test_sqlcipher.py
+++ b/testing/tests/benchmarks/test_sqlcipher.py
@@ -5,7 +5,7 @@ import pytest
 
 from twisted.internet.defer import gatherResults
 
-pytestmark = pytest.mark.perf
+pytestmark = pytest.mark.benchmark
 
 
 def load_up(client, amount, payload, defer=True):
diff --git a/testing/tests/perf/test_sync.py b/testing/tests/benchmarks/test_sync.py
index 9bb20389..88afe9f8 100644
--- a/testing/tests/perf/test_sync.py
+++ b/testing/tests/benchmarks/test_sync.py
@@ -1,6 +1,6 @@
 import pytest
 
-pytestmark = pytest.mark.perf
+pytestmark = pytest.mark.benchmark
 
 
 @pytest.inlineCallbacks
diff --git a/testing/tox.ini b/testing/tox.ini
index f6470c89..f720d0a6 100644
--- a/testing/tox.ini
+++ b/testing/tox.ini
@@ -4,7 +4,7 @@ skipsdist=True
 
 [testenv]
 basepython = python2.7
-commands = py.test -m "not perf" \
+commands = py.test -m "not benchmark" \
                    --cov-report=html \
                    --cov-report=term \
                    --cov=leap.soledad \
@@ -31,11 +31,11 @@ setenv =
     TERM=xterm
 install_command = pip install {opts} {packages}
 
-[testenv:perf]
+[testenv:benchmark]
 deps =
     {[testenv]deps}
     pytest-benchmark
-commands = py.test -m perf {posargs}
+commands = py.test -m benchmark {posargs}
 
 [testenv:code-check]
 changedir = ..