From fefbfcd5036df432557afd2fdfeb9f41afa3b441 Mon Sep 17 00:00:00 2001 From: Chase Sterling Date: Tue, 5 Jul 2016 20:29:36 -0400 Subject: [PATCH] Make temp dir handling in tests a bit more pythonic (and let them work on Windows) --- realms/lib/test.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/realms/lib/test.py b/realms/lib/test.py index 4295ff3..dd5b683 100644 --- a/realms/lib/test.py +++ b/realms/lib/test.py @@ -1,17 +1,20 @@ +import os +import shutil +import tempfile from flask.ext.testing import TestCase from realms.lib.util import random_string from realms import create_app -from subprocess import call class BaseTest(TestCase): def create_app(self): + self.tempdir = tempfile.mkdtemp() app = create_app() app.config['TESTING'] = True app.config['PRESERVE_CONTEXT_ON_EXCEPTION'] = False - app.config['WIKI_PATH'] = '/tmp/%s' % random_string(12) - app.config['DB_URI'] = 'sqlite:////tmp/%s.db' % random_string(12) + app.config['WIKI_PATH'] = os.path.join(self.tempdir, random_string(12)) + app.config['DB_URI'] = 'sqlite:///%s/%s.db' % (self.tempdir, random_string(12)) app.config.update(self.configure()) return app @@ -19,5 +22,4 @@ class BaseTest(TestCase): return {} def tearDown(self): - call(['rm', '-rf', self.app.config['WIKI_PATH']]) - call(['rm', '-f', self.app.config['DB_URI'][10:]]) + shutil.rmtree(self.tempdir)