From dd1328a16f56bf9bdcf2f1d0a42a5561988232d7 Mon Sep 17 00:00:00 2001 From: Eugene Triguba Date: Sun, 26 Jul 2020 21:39:51 -0500 Subject: Remove DefaultAddress and DefaultSocket and rename test files --- lirc/connection/default_address.py | 12 ------- lirc/connection/default_socket.py | 13 ------- tests/test_client.py | 69 ++++++++++++++++++++++++++++++++++++++ tests/test_lirc.py | 69 -------------------------------------- tests/test_reply_packet.py | 66 ------------------------------------ tests/test_reply_packet_parser.py | 66 ++++++++++++++++++++++++++++++++++++ 6 files changed, 135 insertions(+), 160 deletions(-) delete mode 100644 lirc/connection/default_address.py delete mode 100644 lirc/connection/default_socket.py create mode 100644 tests/test_client.py delete mode 100644 tests/test_lirc.py delete mode 100644 tests/test_reply_packet.py create mode 100644 tests/test_reply_packet_parser.py diff --git a/lirc/connection/default_address.py b/lirc/connection/default_address.py deleted file mode 100644 index 4d87703..0000000 --- a/lirc/connection/default_address.py +++ /dev/null @@ -1,12 +0,0 @@ -from enum import Enum - - -class DefaultAddress(Enum): - """ - Default addresses to use for connecting to the - lircd daemon, depending on the operating system. - """ - - LINUX = "/var/run/lirc/lircd" - WINDOWS = ("localhost", 8765) - DARWIN = "/opt/run/var/run/lirc/lircd" diff --git a/lirc/connection/default_socket.py b/lirc/connection/default_socket.py deleted file mode 100644 index ee95529..0000000 --- a/lirc/connection/default_socket.py +++ /dev/null @@ -1,13 +0,0 @@ -import socket -from enum import Enum - - -class DefaultSocket(Enum): - """ - Default socket to use for the lircd socket, depending - on the operating system. - """ - - LINUX = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) - DARWIN = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) - WINDOWS = socket.socket(socket.AF_INET, socket.SOCK_STREAM) diff --git a/tests/test_client.py b/tests/test_client.py new file mode 100644 index 0000000..4253bf0 --- /dev/null +++ b/tests/test_client.py @@ -0,0 +1,69 @@ +# from unittest import mock +# +# import pytest +# +# from lirc import Client +# from lirc.connection.default_address import DefaultAddress +# from lirc.connection.default_socket import DefaultSocket + + +# @mock.patch("socket.socket") +# @mock.patch("platform.system") +# @pytest.mark.parametrize("os_name", ["WINDOWS", "DARWIN", "LINUX"]) +# def test_default_lirc_initialization(mocked_system, mocked_socket, os_name): +# mocked_system.return_value = os_name +# expected_socket = DefaultSocket[os_name].value +# expected_address = DefaultAddress[os_name].value +# +# Client() +# # lirc_socket = lirc.socket +# +# assert mocked_socket.family == expected_socket.family +# assert mocked_socket.type == expected_socket.type +# mocked_socket.connect.assert_called_with(expected_address) +# mocked_socket.settimeout.assert_called_with(5.0) +# +# +# def test_custom_lirc_initialization(mock_socket): +# CUSTOM_ADDRESS = "CUSTOM" +# CUSTOM_TIMEOUT = 10.0 +# +# Client(socket=mock_socket, address=CUSTOM_ADDRESS, timeout=CUSTOM_TIMEOUT) +# +# mock_socket.connect.assert_called_with(CUSTOM_ADDRESS) +# mock_socket.settimeout.assert_called_with(CUSTOM_TIMEOUT) + + +# @pytest.mark.parametrize( +# "reply_packet, repeat_count", +# [ +# (b"BEGIN\nSEND_ONCE remote key\nSUCCESS\nEND\n", 1), +# # (b"BEGIN\nSEND_ONCE remote key\nERROR\nEND\n", 1), +# # (b"BEGIN\nSEND_ONCE remote key\nSUCCESS\nEND\n", 5), +# ], +# ) +# def test_send_once(mock_lirc, reply_packet, repeat_count): +# REMOTE = "remote" +# KEY = "key" +# COMMAND = f"SEND_ONCE {REMOTE} {KEY}" +# mock_lirc.socket.recv.return_value = reply_packet +# +# response = mock_lirc.send(KEY, REMOTE, repeat_count=repeat_count) +# +# mock_lirc.socket.sendall.assert_called_with((COMMAND + "\n").encode(ENCODING)) +# +# +# if repeat_count > 1: +# assert type(response) == list +# assert len(response) == repeat_count +# +# for r in response: +# _ensure_lirc_response(r, COMMAND) +# else: +# _ensure_lirc_response(response, COMMAND) +# +# +# def _ensure_lirc_response(response: LircResponse, command: str, data: list = []): +# assert type(response) == LircResponse +# assert response.command == command +# assert response.data == data diff --git a/tests/test_lirc.py b/tests/test_lirc.py deleted file mode 100644 index 4253bf0..0000000 --- a/tests/test_lirc.py +++ /dev/null @@ -1,69 +0,0 @@ -# from unittest import mock -# -# import pytest -# -# from lirc import Client -# from lirc.connection.default_address import DefaultAddress -# from lirc.connection.default_socket import DefaultSocket - - -# @mock.patch("socket.socket") -# @mock.patch("platform.system") -# @pytest.mark.parametrize("os_name", ["WINDOWS", "DARWIN", "LINUX"]) -# def test_default_lirc_initialization(mocked_system, mocked_socket, os_name): -# mocked_system.return_value = os_name -# expected_socket = DefaultSocket[os_name].value -# expected_address = DefaultAddress[os_name].value -# -# Client() -# # lirc_socket = lirc.socket -# -# assert mocked_socket.family == expected_socket.family -# assert mocked_socket.type == expected_socket.type -# mocked_socket.connect.assert_called_with(expected_address) -# mocked_socket.settimeout.assert_called_with(5.0) -# -# -# def test_custom_lirc_initialization(mock_socket): -# CUSTOM_ADDRESS = "CUSTOM" -# CUSTOM_TIMEOUT = 10.0 -# -# Client(socket=mock_socket, address=CUSTOM_ADDRESS, timeout=CUSTOM_TIMEOUT) -# -# mock_socket.connect.assert_called_with(CUSTOM_ADDRESS) -# mock_socket.settimeout.assert_called_with(CUSTOM_TIMEOUT) - - -# @pytest.mark.parametrize( -# "reply_packet, repeat_count", -# [ -# (b"BEGIN\nSEND_ONCE remote key\nSUCCESS\nEND\n", 1), -# # (b"BEGIN\nSEND_ONCE remote key\nERROR\nEND\n", 1), -# # (b"BEGIN\nSEND_ONCE remote key\nSUCCESS\nEND\n", 5), -# ], -# ) -# def test_send_once(mock_lirc, reply_packet, repeat_count): -# REMOTE = "remote" -# KEY = "key" -# COMMAND = f"SEND_ONCE {REMOTE} {KEY}" -# mock_lirc.socket.recv.return_value = reply_packet -# -# response = mock_lirc.send(KEY, REMOTE, repeat_count=repeat_count) -# -# mock_lirc.socket.sendall.assert_called_with((COMMAND + "\n").encode(ENCODING)) -# -# -# if repeat_count > 1: -# assert type(response) == list -# assert len(response) == repeat_count -# -# for r in response: -# _ensure_lirc_response(r, COMMAND) -# else: -# _ensure_lirc_response(response, COMMAND) -# -# -# def _ensure_lirc_response(response: LircResponse, command: str, data: list = []): -# assert type(response) == LircResponse -# assert response.command == command -# assert response.data == data diff --git a/tests/test_reply_packet.py b/tests/test_reply_packet.py deleted file mode 100644 index 86ae311..0000000 --- a/tests/test_reply_packet.py +++ /dev/null @@ -1,66 +0,0 @@ -# import pytest -# -# from lirc import ( -# LircdCommandFailureError, -# LircdInvalidReplyPacketError, -# LircdSocketTimeoutError, -# ) -# from lirc.reply_packet_parser import ReplyPacketParser -# from lirc.utils import ENCODING -# -# -# @pytest.mark.parametrize( -# "reply_packet", [b"BEGIN\nSEND_ONCE remote key\nSUCCESS\nEND\n"] -# ) -# def test_read_reply_packet(mock_socket, reply_packet): -# mock_socket.recv.return_value = reply_packet -# parser = ReplyPacketParser(mock_socket) -# parser.read() -# -# retrieved_packet = parser.feed() -# -# mock_socket.recv.assert_called_with(ReplyPacketParser.BUFFER_LENGTH) -# assert reply_packet == retrieved_packet.encode(ENCODING) -# -# -# @pytest.mark.skip(reason="Not working") -# @pytest.mark.parametrize("reply_packet", [b"INVALID PACKET"]) -# def test_read_reply_packet_socket_timeout(mock_lirc, reply_packet): -# with pytest.raises(LircdSocketTimeoutError): -# mock_lirc.socket.recv.return_value = reply_packet -# ReplyPacketParser.read(mock_lirc.socket) -# -# -# @pytest.mark.parametrize( -# "reply_packet, data, exception", -# [ -# (b"BEGIN\nSEND_ONCE remote key\nSUCCESS\nEND\n", [], None,), -# # ("INVALID PACKET", [], LircdInvalidReplyPacketError), -# ( -# b"BEGIN\nSEND_ONCE remote key\nERROR\nINVALID\n", -# [], -# LircdInvalidReplyPacketError, -# ), -# ( -# b"BEGIN\nSEND_ONCE remote key\nERROR\nDATA\n1\nunknown remote: remote\n", -# ["unknown remote: remote"], -# LircdCommandFailureError, -# ), -# ( -# b"BEGIN\nSEND_ONCE remote key\nSUCCESS\nDATA\n3\nraa\nblah\nbhal\n", -# ["raa", "blah", "bhal"], -# None, -# ), -# ], -# ) -# def test_parse_reply_packet(mock_socket, reply_packet, data, exception): -# mock_socket.recv.return_value = reply_packet -# parser = ReplyPacketParser(mock_socket) -# -# if exception: -# with pytest.raises(exception): -# parser.read() -# parser.feed() -# else: -# parser.read() -# assert parser.feed() == data diff --git a/tests/test_reply_packet_parser.py b/tests/test_reply_packet_parser.py new file mode 100644 index 0000000..86ae311 --- /dev/null +++ b/tests/test_reply_packet_parser.py @@ -0,0 +1,66 @@ +# import pytest +# +# from lirc import ( +# LircdCommandFailureError, +# LircdInvalidReplyPacketError, +# LircdSocketTimeoutError, +# ) +# from lirc.reply_packet_parser import ReplyPacketParser +# from lirc.utils import ENCODING +# +# +# @pytest.mark.parametrize( +# "reply_packet", [b"BEGIN\nSEND_ONCE remote key\nSUCCESS\nEND\n"] +# ) +# def test_read_reply_packet(mock_socket, reply_packet): +# mock_socket.recv.return_value = reply_packet +# parser = ReplyPacketParser(mock_socket) +# parser.read() +# +# retrieved_packet = parser.feed() +# +# mock_socket.recv.assert_called_with(ReplyPacketParser.BUFFER_LENGTH) +# assert reply_packet == retrieved_packet.encode(ENCODING) +# +# +# @pytest.mark.skip(reason="Not working") +# @pytest.mark.parametrize("reply_packet", [b"INVALID PACKET"]) +# def test_read_reply_packet_socket_timeout(mock_lirc, reply_packet): +# with pytest.raises(LircdSocketTimeoutError): +# mock_lirc.socket.recv.return_value = reply_packet +# ReplyPacketParser.read(mock_lirc.socket) +# +# +# @pytest.mark.parametrize( +# "reply_packet, data, exception", +# [ +# (b"BEGIN\nSEND_ONCE remote key\nSUCCESS\nEND\n", [], None,), +# # ("INVALID PACKET", [], LircdInvalidReplyPacketError), +# ( +# b"BEGIN\nSEND_ONCE remote key\nERROR\nINVALID\n", +# [], +# LircdInvalidReplyPacketError, +# ), +# ( +# b"BEGIN\nSEND_ONCE remote key\nERROR\nDATA\n1\nunknown remote: remote\n", +# ["unknown remote: remote"], +# LircdCommandFailureError, +# ), +# ( +# b"BEGIN\nSEND_ONCE remote key\nSUCCESS\nDATA\n3\nraa\nblah\nbhal\n", +# ["raa", "blah", "bhal"], +# None, +# ), +# ], +# ) +# def test_parse_reply_packet(mock_socket, reply_packet, data, exception): +# mock_socket.recv.return_value = reply_packet +# parser = ReplyPacketParser(mock_socket) +# +# if exception: +# with pytest.raises(exception): +# parser.read() +# parser.feed() +# else: +# parser.read() +# assert parser.feed() == data -- cgit v1.2.3