Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tests: adjust TC_00_QubesDaemonProtocol for reorganized api module

Browse Source
This commit is contained in:
Marek Marczykowski-Górecki 2017-06-21 06:25:59 +02:00
parent ea0cbe3a56
commit c1f4c219f9
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qubes/tests/__init__.py
View File

@ -969,10 +969,10 @@ def load_tests(loader, tests, pattern): # pylint: disable=unused-argument
'qubes.tests.vm.appvm', 'qubes.tests.vm.appvm',
'qubes.tests.app', 'qubes.tests.app',
'qubes.tests.tarwriter', 'qubes.tests.tarwriter',
'qubes.tests.api',
'qubes.tests.api_admin', 'qubes.tests.api_admin',
'qubes.tests.api_misc', 'qubes.tests.api_misc',
'qubespolicy.tests', 'qubespolicy.tests',
'qubes.tests.tools.qubesd',
): ):
tests.addTests(loader.loadTestsFromName(modname)) tests.addTests(loader.loadTestsFromName(modname))

4
qubes/tests/tools/qubesd.py → qubes/tests/api.py
View File

@ -23,9 +23,7 @@ import socket
import unittest.mock import unittest.mock
import qubes.api import qubes.api
import qubes.api.admin
import qubes.tests import qubes.tests
import qubes.tools.qubesd
class TestMgmt(object): class TestMgmt(object):
@ -102,7 +100,7 @@ class TC_00_QubesDaemonProtocol(qubes.tests.QubesTestCase):
asyncio.open_connection(sock=self.sock_client)) asyncio.open_connection(sock=self.sock_client))
connect_coro = self.loop.create_connection( connect_coro = self.loop.create_connection(
lambda: qubes.tools.qubesd.QubesDaemonProtocol( lambda: qubes.api.QubesDaemonProtocol(
TestMgmt, app=self.app), TestMgmt, app=self.app),
sock=self.sock_server) sock=self.sock_server)
self.transport, self.protocol = self.loop.run_until_complete( self.transport, self.protocol = self.loop.run_until_complete(

2
rpm_spec/core-dom0.spec
View File

@ -299,6 +299,7 @@ fi
%{python3_sitelib}/qubes/tests/run.py %{python3_sitelib}/qubes/tests/run.py
%{python3_sitelib}/qubes/tests/extra.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_admin.py
%{python3_sitelib}/qubes/tests/api_misc.py %{python3_sitelib}/qubes/tests/api_misc.py
%{python3_sitelib}/qubes/tests/app.py %{python3_sitelib}/qubes/tests/app.py
@ -333,7 +334,6 @@ fi
%dir %{python3_sitelib}/qubes/tests/tools/__pycache__ %dir %{python3_sitelib}/qubes/tests/tools/__pycache__
%{python3_sitelib}/qubes/tests/tools/__pycache__/* %{python3_sitelib}/qubes/tests/tools/__pycache__/*
%{python3_sitelib}/qubes/tests/tools/__init__.py %{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
%dir %{python3_sitelib}/qubes/tests/integ/__pycache__ %dir %{python3_sitelib}/qubes/tests/integ/__pycache__