From c1f4c219f9016b8a395d33364551a7d01578d988 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Wed, 21 Jun 2017 06:25:59 +0200
Subject: [PATCH] tests: adjust TC_00_QubesDaemonProtocol for reorganized api
 module

---
 qubes/tests/__init__.py                 | 2 +-
 qubes/tests/{tools/qubesd.py => api.py} | 4 +---
 rpm_spec/core-dom0.spec                 | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)
 rename qubes/tests/{tools/qubesd.py => api.py} (98%)

diff --git a/qubes/tests/__init__.py b/qubes/tests/__init__.py
index d281d3b22..b4c2ec51f 100644
--- 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 b/qubes/tests/api.py
similarity index 98%
rename from qubes/tests/tools/qubesd.py
rename to qubes/tests/api.py
index 4c6db5a42..b24ab80e7 100644
--- a/qubes/tests/tools/qubesd.py
+++ b/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
index 729df0eff..94cdc402f 100644
--- 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__