From d143953f8d4c4ff42aea73ecd26a7ca6e7eccebc Mon Sep 17 00:00:00 2001 From: AJ Schmidt Date: Sun, 31 Jan 2021 18:18:07 -0500 Subject: [PATCH 1/2] fix unit tests --- test/test_ad2.py | 2 ++ test/test_devices.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/test/test_ad2.py b/test/test_ad2.py index 716fc49..34feb84 100644 --- a/test/test_ad2.py +++ b/test/test_ad2.py @@ -362,5 +362,7 @@ class TestAlarmDecoder(TestCase): self._decoder._on_read(self, data=b'[00010001000000000A--],005,[f70000051003000008020000000000],"FAULT 05 "') self.assertEquals(self._zone_faulted, 5) + self._decoder._on_read(self, data=b'[00010001000000000A--],004,[f70000051003000008020000000000],"FAULT 04 "') + self._decoder._on_read(self, data=b'[00010001000000000A--],004,[f70000051003000008020000000000],"FAULT 05 "') self._decoder._on_read(self, data=b'[00010001000000000A--],004,[f70000051003000008020000000000],"FAULT 04 "') self.assertEquals(self._zone_restored, 3) diff --git a/test/test_devices.py b/test/test_devices.py index 326374a..17cba61 100644 --- a/test/test_devices.py +++ b/test/test_devices.py @@ -81,7 +81,7 @@ class TestSerialDevice(TestCase): self._device.interface = '/dev/ttyS0' self._device.open(no_reader_thread=True) - with patch.object(self._device._device, 'read') as mock: + with patch.object(self._device._device, 'read', return_value=[1]) as mock: with patch('serial.Serial.fileno', return_value=1): with patch.object(select, 'select', return_value=[[1], [], []]): ret = self._device.read() From 355ff9cc6d5108555e1e601bd203a7e893ad39e6 Mon Sep 17 00:00:00 2001 From: AJ Schmidt Date: Thu, 25 Feb 2021 21:52:27 -0500 Subject: [PATCH 2/2] fix py2 unit tests --- alarmdecoder/util.py | 5 ++++- test/test_devices.py | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/alarmdecoder/util.py b/alarmdecoder/util.py index 902b21d..2702a13 100644 --- a/alarmdecoder/util.py +++ b/alarmdecoder/util.py @@ -97,7 +97,10 @@ def filter_ad2prot_byte(buf): """ Return the byte sent in back if valid visible terminal characters or line terminators. """ - c = buf[0] + if sys.version_info > (3,): + c = buf[0] + else: + c = ord(buf) if (c == 10 or c == 13): return buf diff --git a/test/test_devices.py b/test/test_devices.py index 17cba61..d418780 100644 --- a/test/test_devices.py +++ b/test/test_devices.py @@ -80,8 +80,11 @@ class TestSerialDevice(TestCase): def test_read(self): self._device.interface = '/dev/ttyS0' self._device.open(no_reader_thread=True) + side_effect = ["t"] + if sys.version_info > (3,): + side_effect = ["t".encode('utf-8')] - with patch.object(self._device._device, 'read', return_value=[1]) as mock: + with patch.object(self._device._device, 'read', side_effect=side_effect) as mock: with patch('serial.Serial.fileno', return_value=1): with patch.object(select, 'select', return_value=[[1], [], []]): ret = self._device.read()