From d2af88ba8aec749b926508f260d43118a53c1f79 Mon Sep 17 00:00:00 2001
From: Matt Clay <matt@mystile.com>
Date: Thu, 1 Dec 2016 08:45:11 -0800
Subject: [PATCH] Do not replace existing test skip lists.

---
 test/runner/reorganize-tests.sh | 95 ---------------------------------
 1 file changed, 95 deletions(-)

diff --git a/test/runner/reorganize-tests.sh b/test/runner/reorganize-tests.sh
index 1d6daf8986..fff7d70125 100755
--- a/test/runner/reorganize-tests.sh
+++ b/test/runner/reorganize-tests.sh
@@ -6,101 +6,6 @@ source_root=$(python -c "from os import path; print(path.abspath(path.join(path.
 
 cd "${source_root}"
 
-# Convert existing compile skip files to match the unified repository layout.
-
-mkdir -p test/compile
-
-rm -f test/compile/*.txt
-
-for type in core extras; do
-    sed "s|^|/lib/ansible/modules/${type}|" \
-        < "lib/ansible/modules/${type}/test/utils/shippable/sanity-skip-python24.txt" \
-        >> "test/compile/python2.4-skip.txt"
-done
-
-# Existing skip files are only for modules.
-# Add missing skip entries for core code.
-
-cat << EOF >> test/compile/python2.4-skip.txt
-/lib/ansible/modules/__init__.py
-/lib/ansible/module_utils/a10.py
-/lib/ansible/module_utils/rax.py
-/lib/ansible/module_utils/openstack.py
-/lib/ansible/module_utils/cloud.py
-/lib/ansible/module_utils/ec2.py
-/lib/ansible/module_utils/gce.py
-/lib/ansible/module_utils/lxd.py
-/lib/ansible/module_utils/docker_common.py
-/lib/ansible/module_utils/azure_rm_common.py
-/lib/ansible/module_utils/vca.py
-/lib/ansible/module_utils/vmware.py
-/lib/ansible/module_utils/gcp.py
-/lib/ansible/module_utils/gcdns.py
-/lib/ansible/vars/
-/lib/ansible/utils/
-/lib/ansible/template/
-/lib/ansible/plugins/
-/lib/ansible/playbook/
-/lib/ansible/parsing/
-/lib/ansible/inventory/
-/lib/ansible/galaxy/
-/lib/ansible/executor/
-/lib/ansible/errors/
-/lib/ansible/compat/
-/lib/ansible/config/
-/lib/ansible/cli/
-/lib/ansible/constants.py
-/lib/ansible/release.py
-/lib/ansible/__init__.py
-/hacking/
-/contrib/
-/docsite/
-/test/
-EOF
-
-cat << EOF >> test/compile/python2.6-skip.txt
-/contrib/inventory/vagrant.py
-/hacking/dump_playbook_attributes.py
-EOF
-
-cat << EOF >> test/compile/python3.5-skip.txt
-/test/samples/multi.py
-/examples/scripts/uptime.py
-EOF
-
-for path in test/compile/*.txt; do
-    sort -o "${path}" "${path}"
-done
-
-# Not all scripts pass shellcheck yet.
-
-mkdir -p test/sanity/shellcheck
-
-cat << EOF > test/sanity/shellcheck/skip.txt
-test/sanity/code-smell/boilerplate.sh
-EOF
-
-sort -o test/sanity/shellcheck/skip.txt test/sanity/shellcheck/skip.txt
-
-# Add skip list for code-smell scripts.
-# These scripts don't pass, so we can't run them in CI.
-
-cat << EOF > test/sanity/code-smell/skip.txt
-inappropriately-private.sh
-EOF
-
-# Add skip list for validate-modules.
-# Some of these exclusions are temporary, others belong in validate-modules.
-cat << EOF > test/sanity/validate-modules/skip.txt
-lib/ansible/modules/core/utilities/logic/async_status.py
-lib/ansible/modules/core/utilities/helper/_fireball.py
-lib/ansible/modules/core/utilities/helper/_accelerate.py
-lib/ansible/modules/core/test
-lib/ansible/modules/core/.github
-lib/ansible/modules/extras/test
-lib/ansible/modules/extras/.github
-EOF
-
 # Remove existing aliases from previous script runs.
 rm -f test/integration/targets/*/aliases