tests: adjust TC_00_QubesDaemonProtocol for reorganized api module

QubesOS · Jun 21, 2017 · c1f4c21 · c1f4c21
1 parent ea0cbe3
commit c1f4c21
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/qubes/tests/__init__.py b/qubes/tests/__init__.py
@@ -969,10 +969,10 @@ def load_tests(loader, tests, pattern): # pylint: disable=unused-argument
             'qubes.tests.vm.appvm',
             'qubes.tests.app',
             'qubes.tests.tarwriter',
+            'qubes.tests.api',
             'qubes.tests.api_admin',
             'qubes.tests.api_misc',
             'qubespolicy.tests',
-            'qubes.tests.tools.qubesd',
             ):
         tests.addTests(loader.loadTestsFromName(modname))
 

diff --git a/qubes/tests/tools/qubesd.py → qubes/tests/api.py b/qubes/tests/tools/qubesd.py → qubes/tests/api.py
@@ -23,9 +23,7 @@
 import unittest.mock
 
 import qubes.api
-import qubes.api.admin
 import qubes.tests
-import qubes.tools.qubesd
 
 
 class TestMgmt(object):
@@ -102,7 +100,7 @@ def setUp(self):
             asyncio.open_connection(sock=self.sock_client))
 
         connect_coro = self.loop.create_connection(
-            lambda: qubes.tools.qubesd.QubesDaemonProtocol(
+            lambda: qubes.api.QubesDaemonProtocol(
                 TestMgmt, app=self.app),
             sock=self.sock_server)
         self.transport, self.protocol = self.loop.run_until_complete(

diff --git a/rpm_spec/core-dom0.spec b/rpm_spec/core-dom0.spec
@@ -299,6 +299,7 @@ fi
 %{python3_sitelib}/qubes/tests/run.py
 %{python3_sitelib}/qubes/tests/extra.py
 
+%{python3_sitelib}/qubes/tests/api.py
 %{python3_sitelib}/qubes/tests/api_admin.py
 %{python3_sitelib}/qubes/tests/api_misc.py
 %{python3_sitelib}/qubes/tests/app.py
@@ -333,7 +334,6 @@ fi
 %dir %{python3_sitelib}/qubes/tests/tools/__pycache__
 %{python3_sitelib}/qubes/tests/tools/__pycache__/*
 %{python3_sitelib}/qubes/tests/tools/__init__.py
-%{python3_sitelib}/qubes/tests/tools/qubesd.py
 
 %dir %{python3_sitelib}/qubes/tests/integ
 %dir %{python3_sitelib}/qubes/tests/integ/__pycache__