summaryrefslogtreecommitdiff
path: root/testing/test_soledad
diff options
context:
space:
mode:
authordrebs <drebs@leap.se>2016-07-25 07:48:41 -0300
committerdrebs <drebs@leap.se>2016-08-01 21:09:03 -0300
commitfa2c50b9c6cc037a8ab348b5a746b2e728f3068a (patch)
tree4d73a4f8f1f7d5853194119ccbee6eca4ca7da44 /testing/test_soledad
parentc40a2bf488e03bef14d440ab1a847afab6f5fb76 (diff)
[test] allow custom couch url for couch tests
Diffstat (limited to 'testing/test_soledad')
-rw-r--r--testing/test_soledad/util.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/testing/test_soledad/util.py b/testing/test_soledad/util.py
index 02f3859b..e23d185e 100644
--- a/testing/test_soledad/util.py
+++ b/testing/test_soledad/util.py
@@ -27,6 +27,7 @@ import shutil
import random
import string
import couchdb
+import pytest
from uuid import uuid4
from mock import Mock
@@ -344,6 +345,7 @@ class BaseSoledadTest(BaseLeapTest, MockedSharedDBTest):
self.assertEqual(exp_doc.content, doc.content)
+@pytest.mark.usefixtures("couch_url")
class CouchDBTestCase(unittest.TestCase, MockedSharedDBTest):
"""
@@ -354,8 +356,6 @@ class CouchDBTestCase(unittest.TestCase, MockedSharedDBTest):
"""
Make sure we have a CouchDB instance for a test.
"""
- self.couch_port = 5984
- self.couch_url = 'http://localhost:%d' % self.couch_port
self.couch_server = couchdb.Server(self.couch_url)
def delete_db(self, name):