summaryrefslogtreecommitdiffstats
path: root/tests/conftest.py
diff options
context:
space:
mode:
Diffstat (limited to 'tests/conftest.py')
-rw-r--r--tests/conftest.py11
1 files changed, 3 insertions, 8 deletions
diff --git a/tests/conftest.py b/tests/conftest.py
index de842cf..3788b68 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -3,19 +3,14 @@ from unittest import mock
import pytest
-from lirc import Lirc
+from lirc import Client, LircdConnection
@pytest.fixture
def mock_socket():
- return mock.Mock(spec=socket.socket)
+ return mock.MagicMock(spec=socket.socket)
@pytest.fixture
def mock_lirc(mock_socket):
- return Lirc(socket=mock_socket)
-
-
-@pytest.fixture
-def mock_lirc_and_socket(mock_lirc):
- return (mock_lirc, mock_lirc._Lirc__socket)
+ return Client(connection=LircdConnection(socket=mock_socket))