Merge ~rgildein/charm-duplicity:fix-linting into charm-duplicity:master

[Robert Gildein]

fix linting issue with unit test fix

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

PASSED: Continuous integration, rev:7b38f117a91b9b371ec114457d2c25e5c4b3816c
https://jenkins.canonical.com/bootstack/job/lp-charm-duplicity-ci/17/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/1423/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/391/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-duplicity-ci/17//rebuild

review: Approve (continuous-integration)

[Erhan Sunar (esunar)]

LGTM

review: Approve

[Ramesh Sattaru (rameshcan)]

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision af8923ff7c977af1ad7c355a38a57cbe52fd13d8

diff --git a/src/tests/unit/test_actions.py b/src/tests/unit/test_actions.py
index d24aa4c..b78db72 100644
--- a/src/tests/unit/test_actions.py
+++ b/src/tests/unit/test_actions.py
@@ -125,15 +125,16 @@ class TestActions:
         mock_clear_flag.assert_not_called()
 
     @pytest.mark.parametrize(
-        "exception_raised,expected_fail_contains",
+        "exp_exception, exp_string",
         [
             (
                 CalledProcessError(
                     returncode=2, output="my-error-output".encode("utf-8"), cmd="cmd"
                 ),
-                ["2", "my-error-output"],
+                'Command "cmd" failed with return code "2" and error output:\n'
+                "my-error-output",
             ),
-            (Exception("generic exception"), ["generic exception"]),
+            (Exception("generic exception"), "generic exception"),
         ],
     )
     @patch("actions.hookenv")
@@ -146,20 +147,17 @@ class TestActions:
         mock_clear_flag,
         mock_do_backup,
         mock_hookenv,
-        exception_raised,
-        expected_fail_contains,
+        exp_exception,
+        exp_string,
     ):
         """Verify action returns an error."""
         action_args = ["actions/do-backup"]
-        mock_do_backup.side_effect = exception_raised
+        mock_do_backup.side_effect = exp_exception
         actions.ACTIONS["do-backup"] = mock_do_backup
-        try:
-            actions.main(action_args)
-        except Exception as e:
-            assert type(exception_raised) == type(e)
-            for expected_contain in expected_fail_contains:
-                assert expected_contain in str(e)
-        mock_hookenv.action_fail.assert_called()
+
+        actions.main(action_args)
+
+        mock_hookenv.action_fail.assert_called_with(exp_string)
         mock_remove.assert_not_called()
         mock_clear_flag.assert_not_called()