From 34137b6b73a33ce8a29f5a536ab366d6e19d8f7b Mon Sep 17 00:00:00 2001 From: drebs Date: Sat, 2 Jun 2018 09:55:44 -0300 Subject: Mark tests that need couch --- tests/couch/test_atomicity.py | 1 + tests/couch/test_backend.py | 8 ++++++++ tests/couch/test_command.py | 2 ++ tests/couch/test_ddocs.py | 2 ++ tests/couch/test_state.py | 1 + tests/couch/test_sync.py | 2 ++ tests/couch/test_sync_target.py | 2 ++ tests/server/test_incoming_server.py | 1 + tests/server/test_tac.py | 1 + 9 files changed, 20 insertions(+) diff --git a/tests/couch/test_atomicity.py b/tests/couch/test_atomicity.py index 48e1c01d..05932abf 100644 --- a/tests/couch/test_atomicity.py +++ b/tests/couch/test_atomicity.py @@ -41,6 +41,7 @@ from test_soledad.u1db_tests import TestCaseWithServer REPEAT_TIMES = 20 +@pytest.mark.needs_couch @pytest.mark.usefixtures('method_tmpdir') class CouchAtomicityTestCase(CouchDBTestCase, TestCaseWithServer): diff --git a/tests/couch/test_backend.py b/tests/couch/test_backend.py index 9dfa22ac..7e9bf921 100644 --- a/tests/couch/test_backend.py +++ b/tests/couch/test_backend.py @@ -18,6 +18,7 @@ Test ObjectStore and Couch backend bits. """ +import pytest from uuid import uuid4 from six.moves.urllib.parse import urljoin from testscenarios import TestWithScenarios @@ -35,6 +36,7 @@ from .common import COUCH_SCENARIOS # The following tests come from `u1db.tests.test_common_backend`. # ----------------------------------------------------------------------------- +@pytest.mark.needs_couch class TestCouchBackendImpl(CouchDBTestCase): def test__allocate_doc_id(self): @@ -53,12 +55,14 @@ class TestCouchBackendImpl(CouchDBTestCase): # The following tests come from `u1db.tests.test_backends`. # ----------------------------------------------------------------------------- +@pytest.mark.needs_couch class CouchTests( TestWithScenarios, test_backends.AllDatabaseTests, CouchDBTestCase): scenarios = COUCH_SCENARIOS +@pytest.mark.needs_couch class CouchBackendTests( TestWithScenarios, test_backends.LocalDatabaseTests, @@ -67,6 +71,7 @@ class CouchBackendTests( scenarios = COUCH_SCENARIOS +@pytest.mark.needs_couch class CouchValidateGenNTransIdTests( TestWithScenarios, test_backends.LocalDatabaseValidateGenNTransIdTests, @@ -75,6 +80,7 @@ class CouchValidateGenNTransIdTests( scenarios = COUCH_SCENARIOS +@pytest.mark.needs_couch class CouchValidateSourceGenTests( TestWithScenarios, test_backends.LocalDatabaseValidateSourceGenTests, @@ -83,6 +89,7 @@ class CouchValidateSourceGenTests( scenarios = COUCH_SCENARIOS +@pytest.mark.needs_couch class CouchWithConflictsTests( TestWithScenarios, test_backends.LocalDatabaseWithConflictsTests, @@ -103,6 +110,7 @@ class CouchWithConflictsTests( # test_backends.DatabaseIndexTests.tearDown(self) +@pytest.mark.needs_couch class DatabaseNameValidationTest(unittest.TestCase): def test_database_name_validation(self): diff --git a/tests/couch/test_command.py b/tests/couch/test_command.py index 52719065..10506e4b 100644 --- a/tests/couch/test_command.py +++ b/tests/couch/test_command.py @@ -1,3 +1,4 @@ +import pytest from twisted.trial import unittest from leap.soledad.common.couch import state as couch_state @@ -6,6 +7,7 @@ from leap.soledad.common.l2db import errors as u1db_errors from mock import Mock +@pytest.mark.needs_couch class CommandBasedDBCreationTest(unittest.TestCase): def test_ensure_db_using_custom_command(self): diff --git a/tests/couch/test_ddocs.py b/tests/couch/test_ddocs.py index 3937f2de..774e64b7 100644 --- a/tests/couch/test_ddocs.py +++ b/tests/couch/test_ddocs.py @@ -1,3 +1,4 @@ +import pytest from uuid import uuid4 from leap.soledad.common import couch @@ -5,6 +6,7 @@ from leap.soledad.common import couch from test_soledad.util import CouchDBTestCase +@pytest.mark.needs_couch class CouchDesignDocsTests(CouchDBTestCase): def setUp(self): diff --git a/tests/couch/test_state.py b/tests/couch/test_state.py index 2ebcbcb9..1e5d7241 100644 --- a/tests/couch/test_state.py +++ b/tests/couch/test_state.py @@ -25,6 +25,7 @@ def restricted_listing(function): return _set_list +@pytest.mark.needs_couch class CouchStateTests(CouchDBTestCase): def setUp(self): diff --git a/tests/couch/test_sync.py b/tests/couch/test_sync.py index c353518e..bb30847b 100644 --- a/tests/couch/test_sync.py +++ b/tests/couch/test_sync.py @@ -1,3 +1,4 @@ +import pytest from leap.soledad.common.l2db import vectorclock from leap.soledad.common.l2db import errors as u1db_errors @@ -24,6 +25,7 @@ for name, scenario in COUCH_SCENARIOS: # The following tests come from `u1db.tests.test_sync`. # ----------------------------------------------------------------------------- +@pytest.mark.needs_couch class CouchBackendSyncTests( TestWithScenarios, DatabaseBaseTests, diff --git a/tests/couch/test_sync_target.py b/tests/couch/test_sync_target.py index 0370a6d1..fcbc866a 100644 --- a/tests/couch/test_sync_target.py +++ b/tests/couch/test_sync_target.py @@ -1,4 +1,5 @@ import json +import pytest from leap.soledad.common.l2db import SyncTarget from leap.soledad.common.l2db import errors as u1db_errors @@ -19,6 +20,7 @@ target_scenarios = [ ('local', {'create_db_and_target': make_local_db_and_target}), ] +@pytest.mark.needs_couch class CouchBackendSyncTargetTests( TestWithScenarios, DatabaseBaseTests, diff --git a/tests/server/test_incoming_server.py b/tests/server/test_incoming_server.py index 16d5d5e6..5878ef09 100644 --- a/tests/server/test_incoming_server.py +++ b/tests/server/test_incoming_server.py @@ -36,6 +36,7 @@ from test_soledad.util import CouchServerStateForTests from test_soledad.util import CouchDBTestCase +@pytest.mark.needs_couch class IncomingOnCouchServerTestCase(CouchDBTestCase): def setUp(self): diff --git a/tests/server/test_tac.py b/tests/server/test_tac.py index 45bbb142..18cbf20f 100644 --- a/tests/server/test_tac.py +++ b/tests/server/test_tac.py @@ -36,6 +36,7 @@ from twisted.web.client import Agent TAC_FILE_PATH = resource_filename('leap.soledad.server', 'server.tac') +@pytest.mark.needs_couch @pytest.mark.usefixtures("couch_url") class TacServerTestCase(unittest.TestCase): -- cgit v1.2.3