From 5bc0baeafa27f7ec75779a10ef61633d364fd0d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Sat, 29 Sep 2018 02:40:43 +0200
Subject: [PATCH] tests: do not leak objects in object leaks checking function

If any object is leaked, QubesTestCase.cleanup_gc() raises an exception,
which have leaked objects list referenced in its traceback. This happens
after cleanup_traceback(), so isn't cleaned, causing cleanup_gc() fail
for all the further tests in the same test run.

Avoid this, by dropping list just before checking if any object is
leaked.
---
 qubes/tests/__init__.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/qubes/tests/__init__.py b/qubes/tests/__init__.py
index b13f2cc0..131dcb64 100644
--- a/qubes/tests/__init__.py
+++ b/qubes/tests/__init__.py
@@ -409,6 +409,8 @@ class QubesTestCase(unittest.TestCase):
             except ImportError:
                 pass
 
+        # do not keep leaked object references in locals()
+        leaked = bool(leaked)
         assert not leaked
 
     def cleanup_loop(self):