Improv err (#215)

Author: Juliya Smith

src/code42cli/cmds/devices.py

@@ -74,7 +74,9 @@ def _deactivate_device(sdk, device_guid, change_device_name, purge_date):
     try:
         device = _change_device_activation(sdk, device_guid, "deactivate")
     except exceptions.Py42BadRequestError:
-        raise Code42CLIError("The device {} is in legal hold.".format(device_guid))
+        raise Code42CLIError(
+            "The device with GUID '{}' is in legal hold.".format(device_guid)
+        )
     if purge_date:
         _update_cold_storage_purge_date(sdk, device_guid, purge_date)
     if change_device_name and not device.data["name"].startswith("deactivated_"):
@@ -102,9 +104,13 @@ def _change_device_activation(sdk, device_guid, cmd_str):
             sdk.devices.deactivate(device_id)
         return device
     except exceptions.Py42NotFoundError:
-        raise Code42CLIError("The device {} was not found.".format(device_guid))
+        raise Code42CLIError(
+            "The device with GUID '{}' was not found.".format(device_guid)
+        )
     except exceptions.Py42ForbiddenError:
-        raise Code42CLIError("Unable to {} {}.".format(cmd_str, device_guid))
+        raise Code42CLIError(
+            "Unable to {} the device with GUID '{}'.".format(cmd_str, device_guid)
+        )
 
 
 def _verify_guid_type(device_guid):

tests/cmds/test_devices.py

@@ -432,7 +432,10 @@ def test_deactivate_fails_if_device_does_not_exist(
         cli, ["devices", "deactivate", TEST_DEVICE_GUID], obj=cli_state
     )
     assert result.exit_code == 1
-    assert "The device {} was not found.".format(TEST_DEVICE_GUID) in result.output
+    assert (
+        "The device with GUID '{}' was not found.".format(TEST_DEVICE_GUID)
+        in result.output
+    )
 
 
 def test_deactivate_fails_if_device_is_on_legal_hold(
@@ -442,7 +445,10 @@ def test_deactivate_fails_if_device_is_on_legal_hold(
         cli, ["devices", "deactivate", TEST_DEVICE_GUID], obj=cli_state
     )
     assert result.exit_code == 1
-    assert "The device {} is in legal hold.".format(TEST_DEVICE_GUID) in result.output
+    assert (
+        "The device with GUID '{}' is in legal hold.".format(TEST_DEVICE_GUID)
+        in result.output
+    )
 
 
 def test_deactivate_fails_if_device_deactivation_forbidden(
@@ -452,7 +458,10 @@ def test_deactivate_fails_if_device_deactivation_forbidden(
         cli, ["devices", "deactivate", TEST_DEVICE_GUID], obj=cli_state
     )
     assert result.exit_code == 1
-    assert "Unable to deactivate {}.".format(TEST_DEVICE_GUID) in result.output
+    assert (
+        "Unable to deactivate the device with GUID '{}'.".format(TEST_DEVICE_GUID)
+        in result.output
+    )
 
 
 def test_reactivate_reactivates_device(
@@ -469,7 +478,7 @@ def test_reactivate_fails_if_device_does_not_exist(
         cli, ["devices", "reactivate", TEST_DEVICE_GUID], obj=cli_state
     )
     assert result.exit_code == 1
-    assert f"The device {TEST_DEVICE_GUID} was not found." in result.output
+    assert f"The device with GUID '{TEST_DEVICE_GUID}' was not found." in result.output
 
 
 def test_reactivate_fails_if_device_reactivation_forbidden(
@@ -479,7 +488,10 @@ def test_reactivate_fails_if_device_reactivation_forbidden(
         cli, ["devices", "reactivate", TEST_DEVICE_GUID], obj=cli_state
     )
     assert result.exit_code == 1
-    assert f"Unable to reactivate {TEST_DEVICE_GUID}." in result.output
+    assert (
+        f"Unable to reactivate the device with GUID '{TEST_DEVICE_GUID}'."
+        in result.output
+    )
 
 
 def test_show_prints_device_info(runner, cli_state, backupusage_success):