Merge tag '0.9.0'

Tag version 0.9.0

3 files changed, 14 insertions, 2 deletions

diff --git a/testing/tests/client/test_app.py b/testing/tests/client/test_app.py
index fef2f371..6867473e 100644
--- a/testing/tests/client/test_app.py
+++ b/testing/tests/client/test_app.py
@@ -17,6 +17,8 @@
 """
 Test ObjectStore and Couch backend bits.
 """
+import pytest
+
 from testscenarios import TestWithScenarios
 
 from test_soledad.util import BaseSoledadTest
@@ -31,9 +33,15 @@ from test_soledad.u1db_tests import test_backends
 # The following tests come from `u1db.tests.test_backends`.
 # -----------------------------------------------------------------------------
 
+@pytest.mark.usefixtures('method_tmpdir')
 class SoledadTests(
         TestWithScenarios, test_backends.AllDatabaseTests, BaseSoledadTest):
 
+    def setUp(self):
+        TestWithScenarios.setUp(self)
+        test_backends.AllDatabaseTests.setUp(self)
+        BaseSoledadTest.setUp(self)
+
     scenarios = [
         ('token_http', {
             'make_database_for_test': make_token_http_database_for_test,
diff --git a/testing/tests/client/test_doc.py b/testing/tests/client/test_doc.py
index e158d768..36479e90 100644
--- a/testing/tests/client/test_doc.py
+++ b/testing/tests/client/test_doc.py
@@ -17,6 +17,8 @@
 """
 Test Leap backend bits: soledad docs
 """
+import pytest
+
 from testscenarios import TestWithScenarios
 
 from test_soledad.u1db_tests import test_document
@@ -28,6 +30,7 @@ from test_soledad.util import make_soledad_document_for_test
 # The following tests come from `u1db.tests.test_document`.
 # -----------------------------------------------------------------------------
 
+@pytest.mark.usefixtures('method_tmpdir')
 class TestSoledadDocument(
         TestWithScenarios,
         test_document.TestDocument, BaseSoledadTest):
@@ -37,6 +40,7 @@ class TestSoledadDocument(
             'make_document_for_test': make_soledad_document_for_test})])
 
 
+@pytest.mark.usefixtures('method_tmpdir')
 class TestSoledadPyDocument(
         TestWithScenarios,
         test_document.TestPyDocument, BaseSoledadTest):
diff --git a/testing/tests/client/test_https.py b/testing/tests/client/test_https.py
index caac16da..1b6caed6 100644
--- a/testing/tests/client/test_https.py
+++ b/testing/tests/client/test_https.py
@@ -17,7 +17,7 @@
 """
 Test Leap backend bits: https
 """
-from unittest import skip
+import pytest
 
 from testscenarios import TestWithScenarios
 
@@ -62,7 +62,7 @@ def token_leap_https_sync_target(test, host, path, cert_file=None):
     return st
 
 
-@skip("Skiping tests imported from U1DB.")
+@pytest.mark.skip
 class TestSoledadHTTPSyncTargetHttpsSupport(
         TestWithScenarios,
         # test_https.TestHttpSyncTargetHttpsSupport,