From d5bbe37495ee733be5f78de72364f3ec48ed7a0d Mon Sep 17 00:00:00 2001
From: drebs <drebs@leap.se>
Date: Sat, 24 Sep 2016 11:32:13 -0300
Subject: [test] use pytest tmpdir fixture in all tests

Tests that were imported from u1db or created on top of that structure
were leaving temporary directories behind. This could cause problems in
test servers, either by filling the partition or by extrapolating the
maximum amount of files in a directory.

This commit replaces all usages of temporary directories in the old test
structure by pytest tmpdir fixture, which properly cares for removing
temporary directories.
---
 testing/test_soledad/u1db_tests/test_open.py | 15 ++++++++-------
 testing/test_soledad/util.py                 | 13 +------------
 2 files changed, 9 insertions(+), 19 deletions(-)

(limited to 'testing/test_soledad')

diff --git a/testing/test_soledad/u1db_tests/test_open.py b/testing/test_soledad/u1db_tests/test_open.py
index 30d4de00..b572fba0 100644
--- a/testing/test_soledad/u1db_tests/test_open.py
+++ b/testing/test_soledad/u1db_tests/test_open.py
@@ -18,24 +18,25 @@
 """Test u1db.open"""
 
 import os
+import pytest
+
 from unittest import skip
 
-from leap.soledad.common.l2db import (
-    errors, open as u1db_open,
-)
 from test_soledad import u1db_tests as tests
+from test_soledad.u1db_tests.test_backends import TestAlternativeDocument
+
+from leap.soledad.common.l2db import errors
+from leap.soledad.common.l2db import open as u1db_open
 from leap.soledad.common.l2db.backends import sqlite_backend
-from test_soledad.u1db_tests.test_backends \
-    import TestAlternativeDocument
 
 
 @skip("Skiping tests imported from U1DB.")
+@pytest.mark.usefixtures('method_tmpdir')
 class TestU1DBOpen(tests.TestCase):
 
     def setUp(self):
         super(TestU1DBOpen, self).setUp()
-        tmpdir = self.createTempDir()
-        self.db_path = tmpdir + '/test.db'
+        self.db_path = self.tempdir + '/test.db'
 
     def test_open_no_create(self):
         self.assertRaises(errors.DatabaseDoesNotExist,
diff --git a/testing/test_soledad/util.py b/testing/test_soledad/util.py
index e23d185e..d53f6cda 100644
--- a/testing/test_soledad/util.py
+++ b/testing/test_soledad/util.py
@@ -22,8 +22,6 @@ Utilities used by multiple test suites.
 
 
 import os
-import tempfile
-import shutil
 import random
 import string
 import couchdb
@@ -43,7 +41,6 @@ from leap.soledad.common import l2db
 from leap.soledad.common.l2db import sync
 from leap.soledad.common.l2db.remote import http_database
 
-from leap.soledad.common import soledad_assert
 from leap.soledad.common.document import SoledadDocument
 from leap.soledad.common.couch import CouchDatabase
 from leap.soledad.common.couch.state import CouchServerState
@@ -226,6 +223,7 @@ class BaseSoledadTest(BaseLeapTest, MockedSharedDBTest):
     """
     defer_sync_encryption = False
 
+    @pytest.mark.usefixtures("method_tmpdir")
     def setUp(self):
         # The following snippet comes from BaseLeapTest.setUpClass, but we
         # repeat it here because twisted.trial does not work with
@@ -233,7 +231,6 @@ class BaseSoledadTest(BaseLeapTest, MockedSharedDBTest):
 
         self.old_path = os.environ['PATH']
         self.old_home = os.environ['HOME']
-        self.tempdir = tempfile.mkdtemp(prefix="leap_tests-")
         self.home = self.tempdir
         bin_tdir = os.path.join(
             self.tempdir,
@@ -276,14 +273,6 @@ class BaseSoledadTest(BaseLeapTest, MockedSharedDBTest):
                       self._soledad.secrets.secrets_path]:
                 if os.path.isfile(f):
                     os.unlink(f)
-            # The following snippet comes from BaseLeapTest.setUpClass, but we
-            # repeat it here because twisted.trial does not work with
-            # setUpClass/tearDownClass.
-            soledad_assert(
-                self.tempdir.startswith('/tmp/leap_tests-'),
-                "beware! tried to remove a dir which does not "
-                "live in temporal folder!")
-            shutil.rmtree(self.tempdir)
 
         from twisted.internet import reactor
         reactor.addSystemEventTrigger(
-- 
cgit v1.2.3