summaryrefslogtreecommitdiff
path: root/testing/tests/responsiveness/conftest.py
diff options
context:
space:
mode:
authordrebs <drebs@riseup.net>2017-09-17 12:08:25 -0300
committerdrebs <drebs@riseup.net>2017-09-17 15:50:55 -0300
commitcfff46ff9becdbe5cf48816870e625ed253ecc57 (patch)
tree8d239e4499f559d86ed17ea3632008303b25d485 /testing/tests/responsiveness/conftest.py
parentf29abe28bd778838626d12fcabe3980a8ce4fa8c (diff)
[refactor] move tests to root of repository
Tests entrypoint was in a testing/ subfolder in the root of the repository. This was made mainly because we had some common files for tests and we didn't want to ship them (files in testing/test_soledad, which is itself a python package. This sometimes causes errors when loading tests (it seems setuptools is confused with having one python package in a subdirectory of another). This commit moves the tests entrypoint to the root of the repository. Closes: #8952
Diffstat (limited to 'testing/tests/responsiveness/conftest.py')
-rw-r--r--testing/tests/responsiveness/conftest.py20
1 files changed, 0 insertions, 20 deletions
diff --git a/testing/tests/responsiveness/conftest.py b/testing/tests/responsiveness/conftest.py
deleted file mode 100644
index a46aea44..00000000
--- a/testing/tests/responsiveness/conftest.py
+++ /dev/null
@@ -1,20 +0,0 @@
-import pytest
-
-import elastic
-import watchdog as wd
-
-
-def _post_results(dog, request):
- elastic.post(dog.seconds_blocked, request)
-
-
-@pytest.fixture
-def watchdog(request):
- dog = wd.Watchdog()
- dog_d = dog.start()
- request.addfinalizer(lambda: _post_results(dog, request))
-
- def _run(deferred_fun):
- deferred_fun().addCallback(lambda _: dog.stop())
- return dog_d
- return _run