diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/couch/test_command.py | 7 | ||||
| -rw-r--r-- | tests/couch/test_state.py | 23 |
2 files changed, 10 insertions, 20 deletions
diff --git a/tests/couch/test_command.py b/tests/couch/test_command.py index 52719065..9fb2c153 100644 --- a/tests/couch/test_command.py +++ b/tests/couch/test_command.py @@ -10,7 +10,7 @@ class CommandBasedDBCreationTest(unittest.TestCase): def test_ensure_db_using_custom_command(self): state = couch_state.CouchServerState( - "url", create_cmd="/bin/echo") + "url", create_cmd="/bin/echo", check_schema_versions=False) mock_db = Mock() mock_db.replica_uid = 'replica_uid' state.open_database = Mock(return_value=mock_db) @@ -20,11 +20,12 @@ class CommandBasedDBCreationTest(unittest.TestCase): def test_raises_unauthorized_on_failure(self): state = couch_state.CouchServerState( - "url", create_cmd="inexistent") + "url", create_cmd="inexistent", check_schema_versions=False) self.assertRaises(u1db_errors.Unauthorized, state.ensure_database, "user-1337") def test_raises_unauthorized_by_default(self): - state = couch_state.CouchServerState("url") + state = couch_state.CouchServerState("url", + check_schema_versions=False) self.assertRaises(u1db_errors.Unauthorized, state.ensure_database, "user-1337") diff --git a/tests/couch/test_state.py b/tests/couch/test_state.py index 07c03702..e5ac3704 100644 --- a/tests/couch/test_state.py +++ b/tests/couch/test_state.py @@ -2,15 +2,13 @@ import pytest from leap.soledad.common.couch import CONFIG_DOC_ID from leap.soledad.common.couch import SCHEMA_VERSION from leap.soledad.common.couch import SCHEMA_VERSION_KEY -from leap.soledad.common.couch.state import check_schema_versions +from leap.soledad.common.couch.state import CouchServerState from uuid import uuid4 from leap.soledad.common.errors import WrongCouchSchemaVersionError from leap.soledad.common.errors import MissingCouchConfigDocumentError from test_soledad.util import CouchDBTestCase -from twisted.internet import defer - class CouchDesignDocsTests(CouchDBTestCase): @@ -18,26 +16,17 @@ class CouchDesignDocsTests(CouchDBTestCase): CouchDBTestCase.setUp(self) self.db = self.couch_server.create('user-' + uuid4().hex) self.addCleanup(self.delete_db, self.db.name) - from twisted.internet import reactor - from twisted.web.client import HTTPConnectionPool, Agent - self.pool = HTTPConnectionPool(reactor, persistent=False) - self.agent = Agent(reactor, pool=self.pool) - - @defer.inlineCallbacks - def tearDown(self): - yield self.pool.closeCachedConnections() - @defer.inlineCallbacks def test_wrong_couch_version_raises(self): wrong_schema_version = SCHEMA_VERSION + 1 self.db.create( {'_id': CONFIG_DOC_ID, SCHEMA_VERSION_KEY: wrong_schema_version}) with pytest.raises(WrongCouchSchemaVersionError): - yield check_schema_versions(self.couch_url, agent=self.agent) + CouchServerState(self.couch_url, create_cmd='/bin/echo', + check_schema_versions=True) - @defer.inlineCallbacks - @pytest.mark.runme def test_missing_config_doc_raises(self): self.db.create({}) - with pytest.raises(Exception): - yield check_schema_versions(self.couch_url, agent=self.agent) + with pytest.raises(MissingCouchConfigDocumentError): + CouchServerState(self.couch_url, create_cmd='/bin/echo', + check_schema_versions=True) |