From b454115e9fb1d97f4753d871f838b424a6abb092 Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Sun, 8 Oct 2017 16:30:50 -0700 Subject: [PATCH] Update test cases * Remove cloudstack, f5, and nxos from the wildcard import whitelist * Remove nxos and f5 from the get_exception whitelist * Remove some files from the pep8 legacy whitelist --- test/sanity/code-smell/no-get-exception.sh | 1 - test/sanity/code-smell/no-wildcard-import.sh | 3 --- test/sanity/pep8/legacy-files.txt | 2 -- 3 files changed, 6 deletions(-) diff --git a/test/sanity/code-smell/no-get-exception.sh b/test/sanity/code-smell/no-get-exception.sh index cbd2353a8a..3a264a6323 100755 --- a/test/sanity/code-smell/no-get-exception.sh +++ b/test/sanity/code-smell/no-get-exception.sh @@ -10,7 +10,6 @@ get_exception=$(find . -path ./test/runner/.tox -prune \ -o -path ./lib/ansible/modules/storage/netapp -prune \ -o -path ./lib/ansible/modules/packaging/os -prune \ -o -path ./lib/ansible/modules/network/panos -prune \ - -o -path ./lib/ansible/modules/network/nxos -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 \ diff --git a/test/sanity/code-smell/no-wildcard-import.sh b/test/sanity/code-smell/no-wildcard-import.sh index 13b72ae1d5..df70d059cf 100755 --- a/test/sanity/code-smell/no-wildcard-import.sh +++ b/test/sanity/code-smell/no-wildcard-import.sh @@ -17,10 +17,7 @@ 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 ./test/units/modules/network/cumulus/test_nclu.py -prune \ - -o -path ./lib/ansible/modules/cloud/cloudstack -prune \ -o -path ./lib/ansible/modules/network/f5 -prune \ - -o -path ./lib/ansible/modules/network/nxos -prune \ -o -path ./lib/ansible/modules/packaging/os -prune \ -o -name '*.py' -type f -exec grep -H 'import \*' '{}' '+') diff --git a/test/sanity/pep8/legacy-files.txt b/test/sanity/pep8/legacy-files.txt index 9ca280f709..62d04da6cc 100644 --- a/test/sanity/pep8/legacy-files.txt +++ b/test/sanity/pep8/legacy-files.txt @@ -256,7 +256,6 @@ lib/ansible/modules/network/netvisor/pn_vrouterlbif.py lib/ansible/modules/net_tools/nmcli.py lib/ansible/modules/network/nxos/_nxos_mtu.py lib/ansible/modules/network/nxos/nxos_aaa_server_host.py -lib/ansible/modules/network/nxos/nxos_command.py lib/ansible/modules/network/nxos/nxos_config.py lib/ansible/modules/network/nxos/nxos_gir.py lib/ansible/modules/network/nxos/nxos_gir_profile_management.py @@ -264,7 +263,6 @@ lib/ansible/modules/network/nxos/nxos_igmp.py lib/ansible/modules/network/nxos/nxos_igmp_interface.py lib/ansible/modules/network/nxos/nxos_igmp_snooping.py lib/ansible/modules/network/nxos/nxos_install_os.py -lib/ansible/modules/network/nxos/nxos_ntp.py lib/ansible/modules/network/nxos/nxos_ntp_auth.py lib/ansible/modules/network/nxos/nxos_ntp_options.py lib/ansible/modules/network/nxos/nxos_nxapi.py