From fb4135e43ece716396e6723510c3e7eddb06c85a Mon Sep 17 00:00:00 2001 From: Eugene Triguba Date: Fri, 24 Jul 2020 14:28:15 -0500 Subject: Start refactor of tests --- tests/conftest.py | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'tests/conftest.py') diff --git a/tests/conftest.py b/tests/conftest.py index 01e2460..de842cf 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -14,3 +14,8 @@ def mock_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) -- cgit v1.2.3 From b6c7abc311b10f5ee675100cb9420f7a83c88812 Mon Sep 17 00:00:00 2001 From: Eugene Triguba Date: Sun, 26 Jul 2020 18:24:47 -0500 Subject: Fix conftest and ignore tests The tests will need to be redone. --- tests/conftest.py | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'tests/conftest.py') 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)) -- cgit v1.2.3 From 7486bc0c9efe2fe69fcdcedfdd12e09135960300 Mon Sep 17 00:00:00 2001 From: Eugene Triguba Date: Sun, 26 Jul 2020 21:41:35 -0500 Subject: Add mock connection and mock client --- tests/conftest.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'tests/conftest.py') diff --git a/tests/conftest.py b/tests/conftest.py index 3788b68..82c635a 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -12,5 +12,10 @@ def mock_socket(): @pytest.fixture -def mock_lirc(mock_socket): - return Client(connection=LircdConnection(socket=mock_socket)) +def mock_connection(mock_socket): + return LircdConnection(socket=mock_socket) + + +@pytest.fixture +def mock_client(mock_connection): + return Client(connection=mock_connection) -- cgit v1.2.3 From 5a75937b9a7a34674c736c878645e5bb7a4f412d Mon Sep 17 00:00:00 2001 From: Eugene Triguba Date: Sun, 26 Jul 2020 23:04:03 -0500 Subject: Add test for `Client` --- tests/conftest.py | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'tests/conftest.py') diff --git a/tests/conftest.py b/tests/conftest.py index 82c635a..4529cd7 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -19,3 +19,8 @@ def mock_connection(mock_socket): @pytest.fixture def mock_client(mock_connection): return Client(connection=mock_connection) + + +@pytest.fixture +def mock_client_and_connection(mock_connection): + return Client(connection=mock_connection), mock_connection -- cgit v1.2.3