diff --git a/plugins/modules/docker_container_copy_into.py b/plugins/modules/docker_container_copy_into.py index d7aa9ba1..7d2a144e 100644 --- a/plugins/modules/docker_container_copy_into.py +++ b/plugins/modules/docker_container_copy_into.py @@ -848,9 +848,9 @@ def main(): elif mode_parse == 'octal_string_only': mode = parse_octal_string_only(mode) except (TypeError, ValueError) as e: - module.fail_json(msg="Error while parsing 'mode': {error}".format(error=e)) + client.fail("Error while parsing 'mode': {error}".format(error=e)) if mode < 0: - module.fail_json(msg="'mode' must not be negative; got {mode}".format(mode=mode)) + client.fail("'mode' must not be negative; got {mode}".format(mode=mode)) if content is not None: if client.module.params['content_is_b64']: diff --git a/tests/sanity/ignore-2.15.txt b/tests/sanity/ignore-2.15.txt index 14ec3dfd..0a0b790b 100644 --- a/tests/sanity/ignore-2.15.txt +++ b/tests/sanity/ignore-2.15.txt @@ -2,5 +2,6 @@ plugins/inventory/docker_containers.py yamllint:unparsable-with-libyaml plugins/inventory/docker_machine.py yamllint:unparsable-with-libyaml plugins/inventory/docker_swarm.py yamllint:unparsable-with-libyaml +plugins/modules/docker_container_copy_into.py validate-modules:invalid-documentation plugins/modules/docker_container_copy_into.py validate-modules:undocumented-parameter # _max_file_size_for_diff is used by the action plugin plugins/modules/docker_image_build.py validate-modules:invalid-documentation diff --git a/tests/sanity/ignore-2.16.txt b/tests/sanity/ignore-2.16.txt index 82720e59..e50c576e 100644 --- a/tests/sanity/ignore-2.16.txt +++ b/tests/sanity/ignore-2.16.txt @@ -1,5 +1,6 @@ plugins/inventory/docker_containers.py yamllint:unparsable-with-libyaml plugins/inventory/docker_machine.py yamllint:unparsable-with-libyaml plugins/inventory/docker_swarm.py yamllint:unparsable-with-libyaml +plugins/modules/docker_container_copy_into.py validate-modules:invalid-documentation plugins/modules/docker_container_copy_into.py validate-modules:undocumented-parameter # _max_file_size_for_diff is used by the action plugin plugins/modules/docker_image_build.py validate-modules:invalid-documentation diff --git a/tests/unit/plugins/modules/test_docker_container_copy_into.py b/tests/unit/plugins/modules/test_docker_container_copy_into.py index b1dcd727..dfbf5983 100644 --- a/tests/unit/plugins/modules/test_docker_container_copy_into.py +++ b/tests/unit/plugins/modules/test_docker_container_copy_into.py @@ -39,7 +39,7 @@ def test_parse_string(input, expected): ]) def test_parse_int(input): assert parse_modern(input) == input - with pytest.raises(TypeError, match="^must be an octal string, got {value}$".format(value=input)): + with pytest.raises(TypeError, match="^must be an octal string, got {value}L?$".format(value=input)): parse_octal_string_only(input)