From d499358f0aae5e547de054b70786b726c5be65bb Mon Sep 17 00:00:00 2001 From: drebs Date: Mon, 23 Oct 2017 10:30:15 -0200 Subject: [doc] add script for copying doc to leap_se repo --- tests/couch/test_state.py | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) (limited to 'tests/couch/test_state.py') diff --git a/tests/couch/test_state.py b/tests/couch/test_state.py index e5ac3704..07c03702 100644 --- a/tests/couch/test_state.py +++ b/tests/couch/test_state.py @@ -2,13 +2,15 @@ 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 CouchServerState +from leap.soledad.common.couch.state import check_schema_versions 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): @@ -16,17 +18,26 @@ 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): - CouchServerState(self.couch_url, create_cmd='/bin/echo', - check_schema_versions=True) + yield check_schema_versions(self.couch_url, agent=self.agent) + @defer.inlineCallbacks + @pytest.mark.runme def test_missing_config_doc_raises(self): self.db.create({}) - with pytest.raises(MissingCouchConfigDocumentError): - CouchServerState(self.couch_url, create_cmd='/bin/echo', - check_schema_versions=True) + with pytest.raises(Exception): + yield check_schema_versions(self.couch_url, agent=self.agent) -- cgit v1.2.3