From 1d1df74c480d525011f352f76010becb315eeca5 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Fri, 22 Aug 2014 14:41:55 -0700 Subject: Handle latest testtools tearDown checks Latest testtools checks that you only call tearDown once (it also checks that setUp is only called once). Zuul's test framework was calling tearDown from a cleanup which resulted in tearDown being called twice. Once by the test framework and once by zuul's testclasses cleanups. Just remove the explicit tearDown call in the cleanups and let the larger python tooling call tearDown for us. Change-Id: Id8eaa9da5153fdfe9b9f852d2c57838736cb7040 --- tests/base.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/base.py b/tests/base.py index 179f4f484..753bc5e60 100755 --- a/tests/base.py +++ b/tests/base.py @@ -976,7 +976,6 @@ class ZuulTestCase(testtools.TestCase): threads = threading.enumerate() if len(threads) > 1: self.log.error("More than one thread is running: %s" % threads) - super(ZuulTestCase, self).tearDown() def init_repo(self, project): parts = project.split('/') -- cgit v1.2.1