From 4a48fdba1d9ac5a4c5478913162fac6c424aa345 Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Thu, 1 Feb 2018 12:24:07 -0800 Subject: [PATCH] Update code smell blacklists (#35621) Update blacklist for get_exception, boilerplate, and no-wildcard. f5, lenovo, and junos have updated their code. --- test/sanity/code-smell/boilerplate.sh | 6 ---- test/sanity/code-smell/no-get-exception.sh | 29 ++++++++++++-------- test/sanity/code-smell/no-wildcard-import.sh | 1 - 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/test/sanity/code-smell/boilerplate.sh b/test/sanity/code-smell/boilerplate.sh index 20c6c3f204..63ee2114dc 100755 --- a/test/sanity/code-smell/boilerplate.sh +++ b/test/sanity/code-smell/boilerplate.sh @@ -27,10 +27,7 @@ metaclass3=$(find ./lib/ansible/modules -path ./lib/ansible/modules/windows -pru -o -path ./lib/ansible/modules/network/avi -prune \ -o -path ./lib/ansible/modules/network/cloudengine -prune \ -o -path ./lib/ansible/modules/network/eos -prune \ - -o -path ./lib/ansible/modules/network/f5 -prune \ -o -path ./lib/ansible/modules/network/ios -prune \ - -o -path ./lib/ansible/modules/network/junos -prune \ - -o -path ./lib/ansible/modules/network/lenovo -prune \ -o -path ./lib/ansible/modules/network/netvisor -prune \ -o -path ./lib/ansible/modules/network/nxos -prune \ -o -path ./lib/ansible/modules/network/panos -prune \ @@ -45,10 +42,7 @@ future3=$(find ./lib/ansible/modules -path ./lib/ansible/modules/windows -prune -o -path ./lib/ansible/modules/network/avi -prune \ -o -path ./lib/ansible/modules/network/cloudengine -prune \ -o -path ./lib/ansible/modules/network/eos -prune \ - -o -path ./lib/ansible/modules/network/f5 -prune \ -o -path ./lib/ansible/modules/network/ios -prune \ - -o -path ./lib/ansible/modules/network/junos -prune \ - -o -path ./lib/ansible/modules/network/lenovo -prune \ -o -path ./lib/ansible/modules/network/netvisor -prune \ -o -path ./lib/ansible/modules/network/nxos -prune \ -o -path ./lib/ansible/modules/network/panos -prune \ diff --git a/test/sanity/code-smell/no-get-exception.sh b/test/sanity/code-smell/no-get-exception.sh index 3a264a6323..d6e56e6a6d 100755 --- a/test/sanity/code-smell/no-get-exception.sh +++ b/test/sanity/code-smell/no-get-exception.sh @@ -8,19 +8,26 @@ get_exception=$(find . -path ./test/runner/.tox -prune \ -o -path ./lib/ansible/module_utils/pycompat24.py -prune \ -o -path ./lib/ansible/module_utils/basic.py -prune \ -o -path ./lib/ansible/modules/storage/netapp -prune \ - -o -path ./lib/ansible/modules/packaging/os -prune \ + -o -path ./lib/ansible/modules/packaging/os/apt.py -prune \ + -o -path ./lib/ansible/modules/packaging/os/apt_repository.py -prune \ + -o -path ./lib/ansible/modules/packaging/os/yum_repository.py -prune \ -o -path ./lib/ansible/modules/network/panos -prune \ - -o -path ./lib/ansible/modules/network/junos -prune \ - -o -path ./lib/ansible/modules/network/vyos -prune \ - -o -path ./lib/ansible/modules/network/fortios -prune \ - -o -path ./lib/ansible/modules/network/f5 -prune \ - -o -path ./lib/ansible/modules/network/cloudengine -prune \ - -o -path ./lib/ansible/modules/network/aos -prune \ - -o -path ./lib/ansible/modules/network/eos -prune \ - -o -path ./lib/ansible/modules/files -prune \ + -o -path ./lib/ansible/modules/network/junos/junos_facts.py -prune \ + -o -path ./lib/ansible/modules/network/junos/junos_scp.py -prune \ + -o -path ./lib/ansible/modules/network/junos/junos_package.py -prune \ + -o -path ./lib/ansible/modules/network/vyos/vyos_command.py -prune \ + -o -path ./lib/ansible/modules/network/fortios/fortios_address.py -prune \ + -o -path ./lib/ansible/modules/network/cloudengine/ce_file_copy.py -prune \ + -o -path ./lib/ansible/modules/network/aos/aos_blueprint_param.py -prune \ + -o -path ./lib/ansible/modules/network/aos/aos_blueprint.py -prune \ + -o -path ./lib/ansible/modules/network/aos/aos_blueprint_virtnet.py -prune \ + -o -path ./lib/ansible/modules/network/eos/eos_command.py -prune \ + -o -path ./lib/ansible/modules/files/xattr.py -prune \ + -o -path ./lib/ansible/modules/files/acl.py -prune \ -o -path ./lib/ansible/modules/system -prune \ - -o -path ./lib/ansible/modules/web_infrastructure -prune \ - -o -path ./lib/ansible/plugins/action/wait_for_connection.py -prune \ + -o -path ./lib/ansible/modules/web_infrastructure/jenkins_plugin.py -prune \ + -o -path ./lib/ansible/modules/web_infrastructure/taiga_issue.py -prune \ + -o -path ./lib/ansible/modules/web_infrastructure/htpasswd.py -prune \ -o -name '*.py' -type f -exec grep -H 'get_exception' '{}' '+') basic_failed=0 diff --git a/test/sanity/code-smell/no-wildcard-import.sh b/test/sanity/code-smell/no-wildcard-import.sh index df70d059cf..aae43541af 100755 --- a/test/sanity/code-smell/no-wildcard-import.sh +++ b/test/sanity/code-smell/no-wildcard-import.sh @@ -17,7 +17,6 @@ wildcard_imports=$(find . -path ./test/runner/.tox -prune \ -o -path ./test/units/plugins/action/test_action.py \ -o -path ./lib/ansible/compat/tests/mock.py -prune \ -o -path ./lib/ansible/compat/tests/unittest.py \ - -o -path ./lib/ansible/modules/network/f5 -prune \ -o -path ./lib/ansible/modules/packaging/os -prune \ -o -name '*.py' -type f -exec grep -H 'import \*' '{}' '+')