Merge tag '0.9.2'

Tag version 0.9.2

# gpg: Signature made Thu 22 Dec 2016 05:33:30 PM BRST
# gpg:                using RSA key 0x6071E70DCACC60B2
# gpg: Good signature from "drebs (work key) <db@leap.se>" [ultimate]
# gpg:                 aka "drebs (work key) <drebs@leap.se>" [ultimate]
# Impressão da chave primária: 9F73 295B 6306 E06F 3151  99AE 6071 E70D CACC 60B2

1 files changed, 20 insertions, 13 deletions

diff --git a/testing/tests/couch/test_state.py b/testing/tests/couch/test_state.py
index e293b5b8..e5ac3704 100644
--- a/testing/tests/couch/test_state.py
+++ b/testing/tests/couch/test_state.py
@@ -1,25 +1,32 @@
 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 uuid import uuid4
 
 from leap.soledad.common.errors import WrongCouchSchemaVersionError
 from leap.soledad.common.errors import MissingCouchConfigDocumentError
+from test_soledad.util import CouchDBTestCase
+
 
+class CouchDesignDocsTests(CouchDBTestCase):
 
-def test_wrong_couch_version_raises(db):
-    wrong_schema_version = SCHEMA_VERSION + 1
-    db.database.create(
-        {'_id': CONFIG_DOC_ID, SCHEMA_VERSION_KEY: wrong_schema_version})
-    with pytest.raises(WrongCouchSchemaVersionError):
-        CouchServerState(db.couch_url, create_cmd='/bin/echo',
-                         check_schema_versions=True)
+    def setUp(self):
+        CouchDBTestCase.setUp(self)
+        self.db = self.couch_server.create('user-' + uuid4().hex)
+        self.addCleanup(self.delete_db, self.db.name)
 
+    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)
 
-def test_missing_config_doc_raises(db):
-    db.database.create({})
-    with pytest.raises(MissingCouchConfigDocumentError):
-        CouchServerState(db.couch_url, create_cmd='/bin/echo',
-                         check_schema_versions=True)
+    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)