wip: fixing tests

Author: maxd-nordic

src/nrfcredstore/comms.py

@@ -18,6 +18,7 @@
 from pynrfjprog import LowLevel
 import coloredlogs, logging
 import re
+import platform
 
 logger = logging.getLogger(__name__)
 

tests/test_at_client.py

@@ -19,65 +19,39 @@ class TestATClient:
 
     @pytest.fixture
     def at_client(self):
-        self.serial = Mock()
-        return ATClient(self.serial)
+        self.comms = Mock()
+        return ATClient(self.comms)
 
     @pytest.fixture
     def ok_resp(self, at_client):
-        self.serial.readline.return_value = 'OK\r\n'.encode('utf-8')
+        self.comms.read_line.return_value = 'OK\r\n'
 
     @pytest.fixture
     def not_at_client_resp(self, at_client):
-        self.serial.readline.side_effect = [b'AT: command not found', b'']
+        self.comms.read_line.side_effect = ['AT: command not found', '']
 
     @pytest.fixture
     def error_resp(self, at_client):
-        self.serial.readline.return_value = 'ERROR\r\n'.encode('utf-8')
+        self.comms.read_line.return_value = 'ERROR\r\n'
 
     @pytest.fixture
     def error_code_resp(self, at_client):
-        self.serial.readline.return_value = '+CME ERROR: 514\r\n'.encode('utf-8')
+        self.comms.read_line.return_value = '+CME ERROR: 514\r\n'
 
     @pytest.fixture
     def error_code_0_resp(self, at_client):
-        self.serial.readline.return_value = '+CME ERROR: 0\r\n'.encode('utf-8')
+        self.comms.read_line.return_value = '+CME ERROR: 0\r\n'
 
     @pytest.fixture
     def error_ok_resp(self, at_client):
-        self.serial.readline.side_effect = [b'ERROR', b'OK']
+        self.comms.read_line.side_effect = ['ERROR', 'OK']
 
     def test_create_without_serial_device(self):
         with pytest.raises(RuntimeError):
             ATClient(None)
 
-    def test_at_command_with_serial_closed(self, at_client):
-        with pytest.raises(ConnectionError):
-            self.serial.is_open = False
-            at_client.at_command('AT')
-
-    def test_verify_with_serial_closed(self, at_client):
-        with pytest.raises(ConnectionError):
-            self.serial.is_open = False
-            at_client.verify()
-
     def test_exposes_serial_device(self, at_client):
-        assert at_client.device is self.serial
-
-    def test_connect_sets_port(self, at_client):
-        at_client.connect('/dev/tty.usb')
-        assert self.serial.port == '/dev/tty.usb'
-
-    def test_connect_sets_baudrate(self, at_client):
-        at_client.connect('foo', 123)
-        assert self.serial.baudrate == 123
-
-    def test_connect_sets_timeout(self, at_client):
-        at_client.connect('foo', timeout=3)
-        assert self.serial.timeout == 3
-
-    def test_connect_opens_serial_connection_to_device(self, at_client):
-        at_client.connect('foo')
-        self.serial.open.assert_called()
+        assert at_client.comms is self.comms
 
     def test_verify_fails_for_wrong_response(self, at_client, not_at_client_resp):
         """Test that the AT client verifiation raises NoATClientException when readline returns
@@ -88,7 +62,7 @@ def test_verify_fails_for_wrong_response(self, at_client, not_at_client_resp):
 
     def test_verify_sends_at_command(self, at_client, ok_resp):
         at_client.verify()
-        self.serial.write.assert_called_with('AT\r\n'.encode('utf-8'))
+        self.comms.write.assert_called_with('AT\r\n'.encode('utf-8'))
 
     def test_verify_fails_on_error(self, at_client, error_resp):
         with pytest.raises(NoATClientException):
@@ -99,7 +73,7 @@ def test_verify_retries_on_first_error(self, at_client, error_ok_resp):
 
     def test_enable_error_codes_sends_cmd(self, at_client, ok_resp):
         at_client.enable_error_codes()
-        self.serial.write.assert_called_with(encode_cmd('AT+CMEE=1'))
+        self.comms.write.assert_called_with(encode_cmd('AT+CMEE=1'))
 
     def test_at_command_error(self, at_client, error_resp):
         with pytest.raises(ATCommandError):
@@ -120,9 +94,9 @@ def test_unsupported_cmd_error_code(self, at_client, error_code_0_resp):
         assert 'AT command not supported by firmware version' in str(excinfo.value)
 
     def test_at_command_with_single_line_response(self, at_client):
-        self.serial.readline.side_effect = [b'single', b'OK']
+        self.comms.read_line.side_effect = ['single', 'OK']
         assert at_client.at_command('AT+CGSN') == ['single']
 
     def test_at_command_with_multi_line_response(self, at_client):
-        self.serial.readline.side_effect = [b'foo', b'bar', b'OK']
+        self.comms.read_line.side_effect = ['foo', 'bar', 'OK']
         assert at_client.at_command('AT+CGSN') == ['foo', 'bar']