From a707840596f2bd0b3db2a74a95a978767fb52e70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Wed, 20 Apr 2016 02:26:16 +0200
Subject: [PATCH] tests: fix and enable external tests loader

QubesOS/qubes-issues#1800
---
 qubes/tests/__init__.py |  2 ++
 qubes/tests/extra.py    | 13 +++++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/qubes/tests/__init__.py b/qubes/tests/__init__.py
index eff6c44f..1505a07d 100644
--- a/qubes/tests/__init__.py
+++ b/qubes/tests/__init__.py
@@ -971,6 +971,8 @@ def load_tests(loader, tests, pattern): # pylint: disable=unused-argument
             'qubes.tests.int.tools.qubes_create',
             'qubes.tests.int.tools.qvm_prefs',
             'qubes.tests.int.tools.qvm_run',
+            # external modules
+            'qubes.tests.extra',
             ):
         tests.addTests(loader.loadTestsFromName(modname))
 
diff --git a/qubes/tests/extra.py b/qubes/tests/extra.py
index c5c44a5a..21b67063 100644
--- a/qubes/tests/extra.py
+++ b/qubes/tests/extra.py
@@ -32,6 +32,10 @@ class ExtraTestCase(qubes.tests.SystemTestsMixin, qubes.tests.QubesTestCase):
 
     template = None
 
+    def setUp(self):
+        super(ExtraTestCase, self).setUp()
+        self.init_default_template(self.template)
+
     def create_vms(self, names):
         """
         Create AppVMs for the duration of the test. Will be automatically
@@ -47,14 +51,15 @@ class ExtraTestCase(qubes.tests.SystemTestsMixin, qubes.tests.QubesTestCase):
         for vmname in names:
             vm = self.app.add_new_vm(qubes.vm.appvm.AppVM,
                                     name=self.make_vm_name(vmname),
-                                    template=template)
-            vm.create_on_disk(verbose=False)
+                                    template=template,
+                                    label='red')
+            vm.create_on_disk()
         self.save_and_reload_db()
 
         # get objects after reload
         vms = []
         for vmname in names:
-            vms.append(self.app.domains[self.make_vm_name])
+            vms.append(self.app.domains[self.make_vm_name(vmname)])
         return vms
 
     def enable_network(self):
@@ -66,7 +71,7 @@ class ExtraTestCase(qubes.tests.SystemTestsMixin, qubes.tests.QubesTestCase):
 
 def load_tests(loader, tests, pattern):
     for entry in pkg_resources.iter_entry_points('qubes.tests.extra'):
-        for test_case in entry():
+        for test_case in entry.load()():
             tests.addTests(loader.loadTestsFromTestCase(test_case))
 
     try: