From 0362acbcae9dcdcb97474cc97788fd1983184b84 Mon Sep 17 00:00:00 2001 From: Peter Kessen Date: Mon, 20 Dec 2021 19:05:51 +0100 Subject: [PATCH 01/20] Add test case for player.py --- test/test_player.py | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100755 test/test_player.py diff --git a/test/test_player.py b/test/test_player.py new file mode 100755 index 000000000..62fdd0271 --- /dev/null +++ b/test/test_player.py @@ -0,0 +1,41 @@ +#!/usr/bin/env python3 +# coding: utf-8 + +""" +This module tests the functions inside of player.py +""" + +import unittest +from unittest import mock +from unittest.mock import Mock +import os +import sys +import can +import can.player + +from .config import * + + +class TestPlayerScriptModule(unittest.TestCase): + def setUp(self) -> None: + # Patch VirtualBus object + patcher_virtual_bus = mock.patch("can.interfaces.virtual.VirtualBus", spec=True) + self.MockVirtualBus = patcher_virtual_bus.start() + self.addCleanup(patcher_virtual_bus.stop) + self.mock_virtual_bus = self.MockVirtualBus.return_value + self.mock_virtual_bus.shutdown = Mock() + + self.baseargs = [sys.argv[0], "-i", "virtual"] + self.logfile = os.path.join(os.path.dirname(__file__), "data", "test_CanMessage.asc") + + def assertSuccessfullCleanup(self): + self.MockVirtualBus.assert_called_once() + + def test_play_virtual(self): + sys.argv = self.baseargs + [self.logfile] + can.player.main() + self.assertSuccessfullCleanup() + + +if __name__ == "__main__": + unittest.main() From ee069470224686764445cf8e8cd8e62a960a375e Mon Sep 17 00:00:00 2001 From: Peter Kessen Date: Mon, 20 Dec 2021 18:06:52 +0000 Subject: [PATCH 02/20] Format code with black --- test/test_player.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/test_player.py b/test/test_player.py index 62fdd0271..1af48e429 100755 --- a/test/test_player.py +++ b/test/test_player.py @@ -26,7 +26,9 @@ def setUp(self) -> None: self.mock_virtual_bus.shutdown = Mock() self.baseargs = [sys.argv[0], "-i", "virtual"] - self.logfile = os.path.join(os.path.dirname(__file__), "data", "test_CanMessage.asc") + self.logfile = os.path.join( + os.path.dirname(__file__), "data", "test_CanMessage.asc" + ) def assertSuccessfullCleanup(self): self.MockVirtualBus.assert_called_once() From 5c72735a0d42fd10a159fec1f3cc1fb3a25da283 Mon Sep 17 00:00:00 2001 From: Peter Kessen Date: Mon, 20 Dec 2021 19:29:39 +0100 Subject: [PATCH 03/20] Add mock for sleep function to fasten up testing --- test/test_player.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/test/test_player.py b/test/test_player.py index 1af48e429..70a507ebe 100755 --- a/test/test_player.py +++ b/test/test_player.py @@ -25,6 +25,11 @@ def setUp(self) -> None: self.mock_virtual_bus = self.MockVirtualBus.return_value self.mock_virtual_bus.shutdown = Mock() + # Patch time sleep object + patcher_sleep = mock.patch("can.io.player.sleep", spec=True) + self.MockSleep = patcher_sleep.start() + self.addCleanup(patcher_sleep.stop) + self.baseargs = [sys.argv[0], "-i", "virtual"] self.logfile = os.path.join( os.path.dirname(__file__), "data", "test_CanMessage.asc" From fec26fbdd6bf8008ea67ac12029ed6ec64b558ae Mon Sep 17 00:00:00 2001 From: Peter Kessen Date: Mon, 20 Dec 2021 19:30:33 +0100 Subject: [PATCH 04/20] Add test for verbose mode --- test/test_player.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/test/test_player.py b/test/test_player.py index 70a507ebe..aeb63764b 100755 --- a/test/test_player.py +++ b/test/test_player.py @@ -43,6 +43,11 @@ def test_play_virtual(self): can.player.main() self.assertSuccessfullCleanup() + def test_play_virtual_verbose(self): + sys.argv = self.baseargs + ["-v", self.logfile] + can.player.main() + self.assertSuccessfullCleanup() + if __name__ == "__main__": unittest.main() From fefdd53972a5cbf2697b99df7211522b1b51e6ae Mon Sep 17 00:00:00 2001 From: Peter Kessen Date: Mon, 20 Dec 2021 19:42:18 +0100 Subject: [PATCH 05/20] Add call count assert --- test/test_player.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/test_player.py b/test/test_player.py index aeb63764b..8fa1e45ef 100755 --- a/test/test_player.py +++ b/test/test_player.py @@ -41,11 +41,13 @@ def assertSuccessfullCleanup(self): def test_play_virtual(self): sys.argv = self.baseargs + [self.logfile] can.player.main() + self.assertEqual(self.MockSleep.call_count, 2) self.assertSuccessfullCleanup() def test_play_virtual_verbose(self): sys.argv = self.baseargs + ["-v", self.logfile] can.player.main() + self.assertEqual(self.MockSleep.call_count, 2) self.assertSuccessfullCleanup() From 0907785c9025e49bcff09f77a2c7e9ba70475309 Mon Sep 17 00:00:00 2001 From: Peter Kessen Date: Mon, 20 Dec 2021 19:42:42 +0100 Subject: [PATCH 06/20] Add test for Keyboard interrupt during execution --- test/test_player.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/test/test_player.py b/test/test_player.py index 8fa1e45ef..12a20ccd8 100755 --- a/test/test_player.py +++ b/test/test_player.py @@ -50,6 +50,14 @@ def test_play_virtual_verbose(self): self.assertEqual(self.MockSleep.call_count, 2) self.assertSuccessfullCleanup() + def test_play_virtual_exit(self): + self.MockSleep.side_effect = KeyboardInterrupt + + sys.argv = self.baseargs + [self.logfile] + can.player.main() + self.assertEqual(self.MockSleep.call_count, 1) + self.assertSuccessfullCleanup() + if __name__ == "__main__": unittest.main() From 4721134c40fbd33465f923ee2beae37b79ee3a34 Mon Sep 17 00:00:00 2001 From: Peter Kessen Date: Mon, 20 Dec 2021 19:53:43 +0100 Subject: [PATCH 07/20] Add todos --- test/test_player.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/test/test_player.py b/test/test_player.py index 12a20ccd8..625c2842e 100755 --- a/test/test_player.py +++ b/test/test_player.py @@ -41,12 +41,15 @@ def assertSuccessfullCleanup(self): def test_play_virtual(self): sys.argv = self.baseargs + [self.logfile] can.player.main() + # TODO: add test two messages sent self.assertEqual(self.MockSleep.call_count, 2) self.assertSuccessfullCleanup() def test_play_virtual_verbose(self): sys.argv = self.baseargs + ["-v", self.logfile] can.player.main() + # TODO: add test two messages sent + # TODO: add test message was printed self.assertEqual(self.MockSleep.call_count, 2) self.assertSuccessfullCleanup() @@ -55,9 +58,15 @@ def test_play_virtual_exit(self): sys.argv = self.baseargs + [self.logfile] can.player.main() + # TODO: add test one message sent self.assertEqual(self.MockSleep.call_count, 1) self.assertSuccessfullCleanup() + def test_play_error_frame(self): + # TODO: implement + sys.argv = self.baseargs + ["--error-frames", self.logfile] + can.player.main() + if __name__ == "__main__": unittest.main() From 1d11a04d3fbb4eb9529d5180ac6fe28a6cc6931c Mon Sep 17 00:00:00 2001 From: Peter Kessen Date: Sun, 26 Dec 2021 14:28:24 +0100 Subject: [PATCH 08/20] Implement check for successfull cleanup and send message call count --- test/test_player.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test/test_player.py b/test/test_player.py index 625c2842e..eb8697a36 100755 --- a/test/test_player.py +++ b/test/test_player.py @@ -23,7 +23,7 @@ def setUp(self) -> None: self.MockVirtualBus = patcher_virtual_bus.start() self.addCleanup(patcher_virtual_bus.stop) self.mock_virtual_bus = self.MockVirtualBus.return_value - self.mock_virtual_bus.shutdown = Mock() + self.mock_virtual_bus.__enter__ = Mock(return_value=self.mock_virtual_bus) # Patch time sleep object patcher_sleep = mock.patch("can.io.player.sleep", spec=True) @@ -37,11 +37,12 @@ def setUp(self) -> None: def assertSuccessfullCleanup(self): self.MockVirtualBus.assert_called_once() + self.mock_virtual_bus.__exit__.assert_called_once() def test_play_virtual(self): sys.argv = self.baseargs + [self.logfile] can.player.main() - # TODO: add test two messages sent + self.assertEqual(self.mock_virtual_bus.send.call_count, 2) self.assertEqual(self.MockSleep.call_count, 2) self.assertSuccessfullCleanup() From bae496efa8f5de98f8d4c1f991a87636515791c0 Mon Sep 17 00:00:00 2001 From: Peter Kessen Date: Sun, 26 Dec 2021 14:31:37 +0100 Subject: [PATCH 09/20] Add assumptions for test cases --- test/test_player.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/test_player.py b/test/test_player.py index eb8697a36..214f017c9 100755 --- a/test/test_player.py +++ b/test/test_player.py @@ -49,18 +49,18 @@ def test_play_virtual(self): def test_play_virtual_verbose(self): sys.argv = self.baseargs + ["-v", self.logfile] can.player.main() - # TODO: add test two messages sent # TODO: add test message was printed + self.assertEqual(self.mock_virtual_bus.send.call_count, 2) self.assertEqual(self.MockSleep.call_count, 2) self.assertSuccessfullCleanup() def test_play_virtual_exit(self): - self.MockSleep.side_effect = KeyboardInterrupt + self.MockSleep.side_effect = [None, KeyboardInterrupt] sys.argv = self.baseargs + [self.logfile] can.player.main() - # TODO: add test one message sent - self.assertEqual(self.MockSleep.call_count, 1) + self.assertEqual(self.mock_virtual_bus.send.call_count, 1) + self.assertEqual(self.MockSleep.call_count, 2) self.assertSuccessfullCleanup() def test_play_error_frame(self): From c41845fb96c6611b99364c3480ed991bbe3889b8 Mon Sep 17 00:00:00 2001 From: Peter Kessen Date: Sun, 26 Dec 2021 14:42:28 +0100 Subject: [PATCH 10/20] Add check for output on screen --- test/test_player.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/test/test_player.py b/test/test_player.py index 214f017c9..65fa5b6b9 100755 --- a/test/test_player.py +++ b/test/test_player.py @@ -10,6 +10,7 @@ from unittest.mock import Mock import os import sys +import io import can import can.player @@ -48,8 +49,10 @@ def test_play_virtual(self): def test_play_virtual_verbose(self): sys.argv = self.baseargs + ["-v", self.logfile] - can.player.main() - # TODO: add test message was printed + with unittest.mock.patch('sys.stdout', new_callable=io.StringIO) as mock_stdout: + can.player.main() + self.assertIn('09 08 07 06 05 04 03 02', mock_stdout.getvalue()) + self.assertIn('05 0c 00 00 00 00 00 00', mock_stdout.getvalue()) self.assertEqual(self.mock_virtual_bus.send.call_count, 2) self.assertEqual(self.MockSleep.call_count, 2) self.assertSuccessfullCleanup() From f6816b90f7f493e49bec7a97fea7a8c503e6308c Mon Sep 17 00:00:00 2001 From: Peter Kessen Date: Sun, 26 Dec 2021 14:56:10 +0100 Subject: [PATCH 11/20] Implement test for replay with error frames --- test/data/logfile_errorframes.asc | 21 +++++++++++++++++++++ test/test_player.py | 19 +++++++++++++++++-- 2 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 test/data/logfile_errorframes.asc diff --git a/test/data/logfile_errorframes.asc b/test/data/logfile_errorframes.asc new file mode 100644 index 000000000..bcb5584a7 --- /dev/null +++ b/test/data/logfile_errorframes.asc @@ -0,0 +1,21 @@ +date Sam Sep 30 15:06:13.191 2017 +base hex timestamps absolute +internal events logged +// version 9.0.0 +Begin Triggerblock Sam Sep 30 15:06:13.191 2017 + 0.000000 Start of measurement + 0.015991 CAN 1 Status:chip status error passive - TxErr: 132 RxErr: 0 + 0.015991 CAN 2 Status:chip status error active + 2.501000 1 ErrorFrame + 2.501010 1 ErrorFrame ECC: 10100010 + 2.501020 2 ErrorFrame Flags = 0xe CodeExt = 0x20a2 Code = 0x82 ID = 0 DLC = 0 Position = 5 Length = 11300 + 2.520002 3 200 Tx r Length = 1704000 BitCount = 145 ID = 88888888x + 2.584921 4 300 Tx r 8 Length = 1704000 BitCount = 145 ID = 88888888x + 3.098426 1 18EBFF00x Rx d 8 01 A0 0F A6 60 3B D1 40 Length = 273910 BitCount = 141 ID = 418119424x + 3.197693 1 18EBFF00x Rx d 8 03 E1 00 4B FF FF 3C 0F Length = 283910 BitCount = 146 ID = 418119424x + 17.876976 1 6F8 Rx d 8 FF 00 0C FE 00 00 00 00 Length = 239910 BitCount = 124 ID = 1784 + 20.105214 2 18EBFF00x Rx d 8 01 A0 0F A6 60 3B D1 40 Length = 273925 BitCount = 141 ID = 418119424x + 20.155119 2 18EBFF00x Rx d 8 02 1F DE 80 25 DF C0 2B Length = 272152 BitCount = 140 ID = 418119424x + 20.204671 2 18EBFF00x Rx d 8 03 E1 00 4B FF FF 3C 0F Length = 283910 BitCount = 146 ID = 418119424x + 20.248887 2 18EBFF00x Rx d 8 04 00 4B FF FF FF FF FF Length = 283925 BitCount = 146 ID = 418119424x +End TriggerBlock diff --git a/test/test_player.py b/test/test_player.py index 65fa5b6b9..ab275b81a 100755 --- a/test/test_player.py +++ b/test/test_player.py @@ -66,10 +66,25 @@ def test_play_virtual_exit(self): self.assertEqual(self.MockSleep.call_count, 2) self.assertSuccessfullCleanup() + def test_play_skip_error_frame(self): + logfile = os.path.join( + os.path.dirname(__file__), "data", "logfile_errorframes.asc" + ) + sys.argv = self.baseargs + ["-v", logfile] + can.player.main() + self.assertEqual(self.mock_virtual_bus.send.call_count, 9) + self.assertEqual(self.MockSleep.call_count, 12) + self.assertSuccessfullCleanup() + def test_play_error_frame(self): - # TODO: implement - sys.argv = self.baseargs + ["--error-frames", self.logfile] + logfile = os.path.join( + os.path.dirname(__file__), "data", "logfile_errorframes.asc" + ) + sys.argv = self.baseargs + ["-v", "--error-frames", logfile] can.player.main() + self.assertEqual(self.mock_virtual_bus.send.call_count, 12) + self.assertEqual(self.MockSleep.call_count, 12) + self.assertSuccessfullCleanup() if __name__ == "__main__": From dcbb9631a742a8951ca19f3f8083300217abfae9 Mon Sep 17 00:00:00 2001 From: Peter Kessen Date: Sun, 26 Dec 2021 13:57:12 +0000 Subject: [PATCH 12/20] Format code with black --- test/test_player.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/test_player.py b/test/test_player.py index ab275b81a..c1048aae6 100755 --- a/test/test_player.py +++ b/test/test_player.py @@ -49,10 +49,10 @@ def test_play_virtual(self): def test_play_virtual_verbose(self): sys.argv = self.baseargs + ["-v", self.logfile] - with unittest.mock.patch('sys.stdout', new_callable=io.StringIO) as mock_stdout: + with unittest.mock.patch("sys.stdout", new_callable=io.StringIO) as mock_stdout: can.player.main() - self.assertIn('09 08 07 06 05 04 03 02', mock_stdout.getvalue()) - self.assertIn('05 0c 00 00 00 00 00 00', mock_stdout.getvalue()) + self.assertIn("09 08 07 06 05 04 03 02", mock_stdout.getvalue()) + self.assertIn("05 0c 00 00 00 00 00 00", mock_stdout.getvalue()) self.assertEqual(self.mock_virtual_bus.send.call_count, 2) self.assertEqual(self.MockSleep.call_count, 2) self.assertSuccessfullCleanup() From 7da73032752a9aee22ac1e1d2717ae4fd78171df Mon Sep 17 00:00:00 2001 From: Peter Kessen Date: Tue, 11 Jan 2022 20:27:34 +0100 Subject: [PATCH 13/20] Remove useless import Co-authored-by: zariiii9003 <52598363+zariiii9003@users.noreply.github.com> --- test/test_player.py | 1 - 1 file changed, 1 deletion(-) diff --git a/test/test_player.py b/test/test_player.py index c1048aae6..ca590a898 100755 --- a/test/test_player.py +++ b/test/test_player.py @@ -14,7 +14,6 @@ import can import can.player -from .config import * class TestPlayerScriptModule(unittest.TestCase): From 2cb76b51f8178d5c5b35d3a0a41e4651e35ef493 Mon Sep 17 00:00:00 2001 From: Peter Kessen Date: Tue, 11 Jan 2022 19:28:31 +0000 Subject: [PATCH 14/20] Format code with black --- test/test_player.py | 1 - 1 file changed, 1 deletion(-) diff --git a/test/test_player.py b/test/test_player.py index ca590a898..a3b88d65a 100755 --- a/test/test_player.py +++ b/test/test_player.py @@ -15,7 +15,6 @@ import can.player - class TestPlayerScriptModule(unittest.TestCase): def setUp(self) -> None: # Patch VirtualBus object From 5c6480bd03c3e0daf6891bd06baf8ca642ea304c Mon Sep 17 00:00:00 2001 From: Peter Kessen Date: Tue, 11 Jan 2022 20:31:59 +0100 Subject: [PATCH 15/20] Correct spell error --- test/test_player.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test/test_player.py b/test/test_player.py index a3b88d65a..d510a3d00 100755 --- a/test/test_player.py +++ b/test/test_player.py @@ -34,7 +34,7 @@ def setUp(self) -> None: os.path.dirname(__file__), "data", "test_CanMessage.asc" ) - def assertSuccessfullCleanup(self): + def assertSuccessfulCleanup(self): self.MockVirtualBus.assert_called_once() self.mock_virtual_bus.__exit__.assert_called_once() @@ -43,7 +43,7 @@ def test_play_virtual(self): can.player.main() self.assertEqual(self.mock_virtual_bus.send.call_count, 2) self.assertEqual(self.MockSleep.call_count, 2) - self.assertSuccessfullCleanup() + self.assertSuccessfulCleanup() def test_play_virtual_verbose(self): sys.argv = self.baseargs + ["-v", self.logfile] @@ -53,7 +53,7 @@ def test_play_virtual_verbose(self): self.assertIn("05 0c 00 00 00 00 00 00", mock_stdout.getvalue()) self.assertEqual(self.mock_virtual_bus.send.call_count, 2) self.assertEqual(self.MockSleep.call_count, 2) - self.assertSuccessfullCleanup() + self.assertSuccessfulCleanup() def test_play_virtual_exit(self): self.MockSleep.side_effect = [None, KeyboardInterrupt] @@ -62,7 +62,7 @@ def test_play_virtual_exit(self): can.player.main() self.assertEqual(self.mock_virtual_bus.send.call_count, 1) self.assertEqual(self.MockSleep.call_count, 2) - self.assertSuccessfullCleanup() + self.assertSuccessfulCleanup() def test_play_skip_error_frame(self): logfile = os.path.join( @@ -72,7 +72,7 @@ def test_play_skip_error_frame(self): can.player.main() self.assertEqual(self.mock_virtual_bus.send.call_count, 9) self.assertEqual(self.MockSleep.call_count, 12) - self.assertSuccessfullCleanup() + self.assertSuccessfulCleanup() def test_play_error_frame(self): logfile = os.path.join( @@ -82,7 +82,7 @@ def test_play_error_frame(self): can.player.main() self.assertEqual(self.mock_virtual_bus.send.call_count, 12) self.assertEqual(self.MockSleep.call_count, 12) - self.assertSuccessfullCleanup() + self.assertSuccessfulCleanup() if __name__ == "__main__": From 1dd4581dc36352ffa374caccdcdd068dde03af29 Mon Sep 17 00:00:00 2001 From: Peter Kessen Date: Sat, 15 Jan 2022 21:57:18 +0100 Subject: [PATCH 16/20] Implement test of function calls --- test/test_player.py | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/test/test_player.py b/test/test_player.py index d510a3d00..c73623c05 100755 --- a/test/test_player.py +++ b/test/test_player.py @@ -41,8 +41,29 @@ def assertSuccessfulCleanup(self): def test_play_virtual(self): sys.argv = self.baseargs + [self.logfile] can.player.main() - self.assertEqual(self.mock_virtual_bus.send.call_count, 2) + msg1 = can.Message( + timestamp=2.501, + arbitration_id=0xC8, + is_extended_id=False, + is_fd=False, + is_rx=False, + channel=1, + dlc=8, + data=[0x9, 0x8, 0x7, 0x6, 0x5, 0x4, 0x3, 0x2], + ) + msg2 = can.Message( + timestamp=17.876708, + arbitration_id=0x6F9, + is_extended_id=False, + is_fd=False, + is_rx=True, + channel=0, + dlc=8, + data=[0x5, 0xC, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0], + ) self.assertEqual(self.MockSleep.call_count, 2) + self.assertTrue(msg1.equals(self.mock_virtual_bus.send.mock_calls[0].args[0])) + self.assertTrue(msg2.equals(self.mock_virtual_bus.send.mock_calls[1].args[0])) self.assertSuccessfulCleanup() def test_play_virtual_verbose(self): From 3382d5310db30359c387889ca2f76b8c71b031e2 Mon Sep 17 00:00:00 2001 From: Peter Kessen Date: Sat, 15 Jan 2022 22:45:00 +0100 Subject: [PATCH 17/20] Limit test for correct calls to python versions >= 3.8 --- test/test_player.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/test/test_player.py b/test/test_player.py index c73623c05..a4f9ed4ad 100755 --- a/test/test_player.py +++ b/test/test_player.py @@ -62,8 +62,10 @@ def test_play_virtual(self): data=[0x5, 0xC, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0], ) self.assertEqual(self.MockSleep.call_count, 2) - self.assertTrue(msg1.equals(self.mock_virtual_bus.send.mock_calls[0].args[0])) - self.assertTrue(msg2.equals(self.mock_virtual_bus.send.mock_calls[1].args[0])) + if sys.version_info.major > 3 or sys.version_info.minor >= 8: + # The args argument was introduced with python 3.8 + self.assertTrue(msg1.equals(self.mock_virtual_bus.send.mock_calls[0].args[0])) + self.assertTrue(msg2.equals(self.mock_virtual_bus.send.mock_calls[1].args[0])) self.assertSuccessfulCleanup() def test_play_virtual_verbose(self): From 67e409805e306fef778442d8c5d65d4c185324ee Mon Sep 17 00:00:00 2001 From: Peter Kessen Date: Sat, 15 Jan 2022 21:45:54 +0000 Subject: [PATCH 18/20] Format code with black --- test/test_player.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/test/test_player.py b/test/test_player.py index a4f9ed4ad..c58ff936e 100755 --- a/test/test_player.py +++ b/test/test_player.py @@ -64,8 +64,12 @@ def test_play_virtual(self): self.assertEqual(self.MockSleep.call_count, 2) if sys.version_info.major > 3 or sys.version_info.minor >= 8: # The args argument was introduced with python 3.8 - self.assertTrue(msg1.equals(self.mock_virtual_bus.send.mock_calls[0].args[0])) - self.assertTrue(msg2.equals(self.mock_virtual_bus.send.mock_calls[1].args[0])) + self.assertTrue( + msg1.equals(self.mock_virtual_bus.send.mock_calls[0].args[0]) + ) + self.assertTrue( + msg2.equals(self.mock_virtual_bus.send.mock_calls[1].args[0]) + ) self.assertSuccessfulCleanup() def test_play_virtual_verbose(self): From a5f0ef80d604643a21f6c4880564143adfcbf9fb Mon Sep 17 00:00:00 2001 From: zariiii9003 <52598363+zariiii9003@users.noreply.github.com> Date: Sun, 16 Jan 2022 00:01:07 +0100 Subject: [PATCH 19/20] simplify version check --- test/test_player.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test_player.py b/test/test_player.py index c58ff936e..efb446e9e 100755 --- a/test/test_player.py +++ b/test/test_player.py @@ -62,7 +62,7 @@ def test_play_virtual(self): data=[0x5, 0xC, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0], ) self.assertEqual(self.MockSleep.call_count, 2) - if sys.version_info.major > 3 or sys.version_info.minor >= 8: + if sys.version_info >= (3, 8): # The args argument was introduced with python 3.8 self.assertTrue( msg1.equals(self.mock_virtual_bus.send.mock_calls[0].args[0]) From 7a20405c5be293e7c293862fd096f126a4d20b89 Mon Sep 17 00:00:00 2001 From: Peter Kessen Date: Sun, 16 Jan 2022 11:33:19 +0100 Subject: [PATCH 20/20] Change shebang and remove coding Co-authored-by: Felix Divo <4403130+felixdivo@users.noreply.github.com> --- test/test_player.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/test_player.py b/test/test_player.py index efb446e9e..2f3307420 100755 --- a/test/test_player.py +++ b/test/test_player.py @@ -1,5 +1,4 @@ -#!/usr/bin/env python3 -# coding: utf-8 +#!/usr/bin/env python """ This module tests the functions inside of player.py