summaryrefslogtreecommitdiff
path: root/testing/tests/server
diff options
context:
space:
mode:
authordrebs <drebs@leap.se>2017-06-30 09:04:29 -0300
committerKali Kaneko <kali@leap.se>2017-07-07 20:59:51 +0200
commit305318a6b2a9cbd638c6c48ce447fb228d7fe47d (patch)
treef31ce5be7312fa592604f51af48b3e59c23acde7 /testing/tests/server
parentab297c4efe10c70949fac5384a63cbf553ba5da9 (diff)
[test] mark tests that depend on couchdb server
Diffstat (limited to 'testing/tests/server')
-rw-r--r--testing/tests/server/test_server.py1
-rw-r--r--testing/tests/server/test_shared_db.py1
-rw-r--r--testing/tests/server/test_url_mapper.py2
3 files changed, 4 insertions, 0 deletions
diff --git a/testing/tests/server/test_server.py b/testing/tests/server/test_server.py
index bc80905e..25f0cc2d 100644
--- a/testing/tests/server/test_server.py
+++ b/testing/tests/server/test_server.py
@@ -40,6 +40,7 @@ from leap.soledad.client import _crypto
from leap.soledad.client import Soledad
+@pytest.mark.needs_couch
@pytest.mark.usefixtures("method_tmpdir")
class EncryptedSyncTestCase(
CouchDBTestCase, TestCaseWithServer):
diff --git a/testing/tests/server/test_shared_db.py b/testing/tests/server/test_shared_db.py
index 4f3b1787..96af6dff 100644
--- a/testing/tests/server/test_shared_db.py
+++ b/testing/tests/server/test_shared_db.py
@@ -28,6 +28,7 @@ from leap.soledad.common.document import SoledadDocument
from leap.soledad.common.l2db.errors import RevisionConflict
+@pytest.mark.needs_couch
class SharedDbTests(unittest.TestCase):
"""
"""
diff --git a/testing/tests/server/test_url_mapper.py b/testing/tests/server/test_url_mapper.py
index fa99cae7..a04e7593 100644
--- a/testing/tests/server/test_url_mapper.py
+++ b/testing/tests/server/test_url_mapper.py
@@ -17,6 +17,7 @@
"""
Tests for server-related functionality.
"""
+import pytest
from twisted.trial import unittest
from uuid import uuid4
@@ -49,6 +50,7 @@ class URLMapperTestCase(unittest.TestCase):
self._urlmap = URLMapper()
self._dbname = 'user-%s' % self._uuid
+ @pytest.mark.needs_couch
def test_root_authorized(self):
match = self._urlmap.match('/', 'GET')
self.assertIsNotNone(match)