Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix inheritance issues and separate the mocked dbus into an object #184

Merged
merged 10 commits into from
Nov 30, 2023
Merged

Fix inheritance issues and separate the mocked dbus into an object #184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
46b9f91
testcase: actually delete the datadir
whot Nov 4, 2023
78df3c5
testcase: reset the datadir on the DBusTestCaseClass
whot Nov 4, 2023
6b6d562
testcase: start the bus on our class, not on the parent
whot Nov 4, 2023
d33f1a3
pytest: make the fixture a subclass of DBusTestCase
whot Nov 4, 2023
aec77f3
testcase: assert our parent class never gets bus PIDs
whot Nov 4, 2023
4724d63
testcase: move some classmethods to staticmethods
whot Nov 5, 2023
7fe90f3
testcase: replace the classmethods with a proper object
whot Nov 6, 2023
47adffe
testcase: factor the server spawning into a new SpawnedMock object
whot Nov 6, 2023
f103698
testcase: remove unnecessary compat methods
whot Nov 13, 2023
c39fc5b
testcase: switch to seconds from deciseconds
whot Nov 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions dbusmock/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@


from dbusmock.mockobject import MOCK_IFACE, OBJECT_MANAGER_IFACE, DBusMockObject, get_object, get_objects
from dbusmock.testcase import DBusTestCase
from dbusmock.testcase import BusType, DBusTestCase, PrivateDBus, SpawnedMock

try:
# created by setuptools_scm
Expand All @@ -25,4 +25,4 @@


__all__ = ['DBusMockObject', 'MOCK_IFACE', 'OBJECT_MANAGER_IFACE',
'DBusTestCase', 'get_object', 'get_objects']
'DBusTestCase', 'PrivateDBus', 'BusType', 'SpawnedMock', 'get_object', 'get_objects']
25 changes: 7 additions & 18 deletions dbusmock/pytest_fixtures.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,31 +13,20 @@

import pytest

import dbusmock.testcase


@pytest.fixture(name='dbusmock_test', scope='session')
def fixture_dbusmock_test() -> Iterator[dbusmock.testcase.DBusTestCase]:
'''Export the whole DBusTestCase as a fixture.'''

testcase = dbusmock.testcase.DBusTestCase()
testcase.setUp()
yield testcase
testcase.tearDown()
testcase.tearDownClass()
from dbusmock.testcase import BusType, PrivateDBus


@pytest.fixture(scope='session')
def dbusmock_system(dbusmock_test) -> dbusmock.testcase.DBusTestCase:
def dbusmock_system() -> Iterator[PrivateDBus]:
'''Export the whole DBusTestCase as a fixture, with the system bus started'''

dbusmock_test.start_system_bus()
return dbusmock_test
with PrivateDBus(BusType.SYSTEM) as bus:
yield bus


@pytest.fixture(scope='session')
def dbusmock_session(dbusmock_test) -> dbusmock.testcase.DBusTestCase:
def dbusmock_session() -> Iterator[PrivateDBus]:
'''Export the whole DBusTestCase as a fixture, with the session bus started'''

dbusmock_test.start_session_bus()
return dbusmock_test
with PrivateDBus(BusType.SESSION) as bus:
yield bus
Loading