summaryrefslogtreecommitdiff
path: root/testing/tests/sync
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/sync
parentab297c4efe10c70949fac5384a63cbf553ba5da9 (diff)
[test] mark tests that depend on couchdb server
Diffstat (limited to 'testing/tests/sync')
-rw-r--r--testing/tests/sync/test_sync.py2
-rw-r--r--testing/tests/sync/test_sync_mutex.py2
-rw-r--r--testing/tests/sync/test_sync_target.py5
3 files changed, 9 insertions, 0 deletions
diff --git a/testing/tests/sync/test_sync.py b/testing/tests/sync/test_sync.py
index bce20894..fb9a0245 100644
--- a/testing/tests/sync/test_sync.py
+++ b/testing/tests/sync/test_sync.py
@@ -15,6 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import json
+import pytest
import threading
import time
@@ -141,6 +142,7 @@ class InterruptableSyncTestCase(
return d
+@pytest.mark.needs_couch
class TestSoledadDbSync(
TestWithScenarios,
SoledadWithCouchServerMixin,
diff --git a/testing/tests/sync/test_sync_mutex.py b/testing/tests/sync/test_sync_mutex.py
index a9335973..fdd2aacd 100644
--- a/testing/tests/sync/test_sync_mutex.py
+++ b/testing/tests/sync/test_sync_mutex.py
@@ -22,6 +22,7 @@ be two concurrent synchronization processes at the same time.
"""
+import pytest
import time
import uuid
@@ -72,6 +73,7 @@ SoledadSynchronizer.sync = _timed_sync
# -- end of monkey-patching
+@pytest.mark.needs_couch
class TestSyncMutex(
BaseSoledadTest, CouchDBTestCase, TestCaseWithServer):
diff --git a/testing/tests/sync/test_sync_target.py b/testing/tests/sync/test_sync_target.py
index bfa322dc..712f0d3f 100644
--- a/testing/tests/sync/test_sync_target.py
+++ b/testing/tests/sync/test_sync_target.py
@@ -20,6 +20,7 @@ Test Leap backend bits: sync target
import os
import time
import json
+import pytest
import random
import string
import shutil
@@ -148,6 +149,7 @@ def make_local_db_and_token_soledad_target(
return db, st
+@pytest.mark.needs_couch
class TestSoledadSyncTarget(
TestWithScenarios,
SoledadWithCouchServerMixin,
@@ -401,6 +403,7 @@ target_scenarios = [
]
+@pytest.mark.needs_couch
class SoledadDatabaseSyncTargetTests(
TestWithScenarios,
SoledadWithCouchServerMixin,
@@ -795,6 +798,7 @@ class SyncTimeoutError(Exception):
pass
+@pytest.mark.needs_couch
class TestSoledadDbSync(
TestWithScenarios,
SoledadWithCouchServerMixin,
@@ -952,6 +956,7 @@ class TestSoledadDbSync(
return d
+@pytest.mark.needs_couch
class SQLCipherSyncTargetTests(SoledadDatabaseSyncTargetTests):
# TODO: implement _set_trace_hook(_shallow) in SoledadHTTPSyncTarget so