From a5599cf56acddcf970902cbac683e03ea6e5de3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Tue, 20 Sep 2016 15:13:18 +0200 Subject: [PATCH] Fixed interference between consecutive unit tests --- tests/abstract_attract_test.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tests/abstract_attract_test.py b/tests/abstract_attract_test.py index 0af98fe..d45c4e4 100644 --- a/tests/abstract_attract_test.py +++ b/tests/abstract_attract_test.py @@ -1,8 +1,5 @@ from pillar.tests import PillarTestServer, AbstractPillarTest -from attract import AttractExtension -from attract.setup import setup_for_attract - MOCK_SVN_URL = 'svn://biserver/mocked' @@ -10,13 +7,20 @@ class AttractTestServer(PillarTestServer): def __init__(self, *args, **kwargs): PillarTestServer.__init__(self, *args, **kwargs) + from attract import AttractExtension self.load_extension(AttractExtension(), '/attract') class AbstractAttractTest(AbstractPillarTest): pillar_server_class = AttractTestServer + def tearDown(self): + self.unload_modules('attract') + AbstractPillarTest.tearDown(self) + def ensure_project_exists(self, project_overrides=None): + from attract.setup import setup_for_attract + project_overrides = dict( picture_header=None, picture_square=None,