wip

Author: maxd-nordic

src/nrfcredstore/cli.py

@@ -131,9 +131,9 @@ def main(args, credstore):
     credstore.command_interface.enable_error_codes()
     exec_cmd(args, credstore)
 
-def run():
+def run(argv=sys.argv):
     logging.basicConfig(level='DEBUG')
-    args = parse_args(sys.argv[1:])
+    args = parse_args(argv[1:])
     comms = None
 
     # use inquirer to find the device

src/nrfcredstore/command_interface.py

@@ -109,7 +109,8 @@ def detect_shell_mode(self):
 
     def enable_error_codes(self):
         """Enable error codes in the AT client"""
-        self.at_command('AT+CMEE=1', wait_for_result=True)
+        if not self.at_command('AT+CMEE=1', wait_for_result=True):
+            logger.error("Failed to enable error codes.")
 
     def at_command(self, at_command, wait_for_result=False, suppress_errors=False):
         """Write an AT command to the command interface. Optionally wait for OK"""

tests/test_cli.py

@@ -2,7 +2,7 @@
 
 from unittest.mock import Mock, ANY, patch
 from serial import SerialException
-from nrfcredstore.cli import main, parse_args, FUN_MODE_OFFLINE
+from nrfcredstore.cli import main, parse_args, run, FUN_MODE_OFFLINE
 
 from nrfcredstore.credstore import CredType
 from nrfcredstore.exceptions import NoATClientException, ATCommandError
@@ -32,6 +32,9 @@ def test_non_responsive_device(self, credstore, command_interface):
             main(parse_args(['fakedev', 'list']), credstore)
         assert e.type == TimeoutError
 
+    def test_non_responsive_device(self, credstore, command_interface, empty_cred_list):
+        command_interface.detect_shell_mode.enable_error_codes.return_value = False
+        main(parse_args(['fakedev', 'list']), credstore)
 
     def test_list_default(self, credstore, empty_cred_list):
         main(parse_args(['fakedev', 'list']), credstore)
@@ -117,6 +120,9 @@ def test_at_command_error_exit_code(self, credstore):
             main(parse_args(['fakedev', 'list']), credstore)
         assert e.type == RuntimeError
 
-# plan for new tests:
-# Comms cannot find device
-# Comms cannot enable error codes
+    def test_cannot_find_device(self):
+        with patch("nrfcredstore.comms.__init__", return_value=Mock()) as mock_comms:
+            mock_comms.side_effect = Exception("No device found")
+            with pytest.raises(Exception) as e:
+                run(['nrfcredstore', 'fakedev', 'list'])
+        assert e.type == Exception