From be48ea4389316409980a47fbcd3ce94b26ab236e Mon Sep 17 00:00:00 2001
From: Matt Clay <matt@mystile.com>
Date: Wed, 2 Nov 2016 21:43:40 -0700
Subject: [PATCH] Simplify compileall checks. Remove py3 skip list.

---
 .../modules/test/utils/shippable/sanity-skip-python24.txt      | 2 +-
 .../modules/test/utils/shippable/sanity-skip-python3.txt       | 0
 .../modules/test/utils/shippable/sanity-test-python24.txt      | 2 --
 lib/ansible/modules/test/utils/shippable/sanity.sh             | 3 +--
 4 files changed, 2 insertions(+), 5 deletions(-)
 delete mode 100644 lib/ansible/modules/test/utils/shippable/sanity-skip-python3.txt
 delete mode 100644 lib/ansible/modules/test/utils/shippable/sanity-test-python24.txt

diff --git a/lib/ansible/modules/test/utils/shippable/sanity-skip-python24.txt b/lib/ansible/modules/test/utils/shippable/sanity-skip-python24.txt
index 1434a04094b..1a0a28c4d49 100644
--- a/lib/ansible/modules/test/utils/shippable/sanity-skip-python24.txt
+++ b/lib/ansible/modules/test/utils/shippable/sanity-skip-python24.txt
@@ -1 +1 @@
-/cloud/
+/cloud/[^/]+/(?!(ec2_facts.py|_ec2_ami_search.py))
diff --git a/lib/ansible/modules/test/utils/shippable/sanity-skip-python3.txt b/lib/ansible/modules/test/utils/shippable/sanity-skip-python3.txt
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/lib/ansible/modules/test/utils/shippable/sanity-test-python24.txt b/lib/ansible/modules/test/utils/shippable/sanity-test-python24.txt
deleted file mode 100644
index 5ad993ee773..00000000000
--- a/lib/ansible/modules/test/utils/shippable/sanity-test-python24.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-cloud/amazon/_ec2_ami_search.py
-cloud/amazon/ec2_facts.py
diff --git a/lib/ansible/modules/test/utils/shippable/sanity.sh b/lib/ansible/modules/test/utils/shippable/sanity.sh
index 3b754afa7b0..8c1453022e7 100755
--- a/lib/ansible/modules/test/utils/shippable/sanity.sh
+++ b/lib/ansible/modules/test/utils/shippable/sanity.sh
@@ -29,11 +29,10 @@ fi
 
 validate_modules="${build_dir}/test/sanity/validate-modules/validate-modules"
 
-python2.4 -m compileall -fq   -i                    "test/utils/shippable/sanity-test-python24.txt"
 python2.4 -m compileall -fq   -x "($(printf %s "$(< "test/utils/shippable/sanity-skip-python24.txt"))" | tr '\n' '|')" .
 python2.6 -m compileall -fq .
 python2.7 -m compileall -fq .
-python3.5 -m compileall -fq . -x "($(printf %s "$(< "test/utils/shippable/sanity-skip-python3.txt"))"  | tr '\n' '|')"
+python3.5 -m compileall -fq .
 
 ANSIBLE_DEPRECATION_WARNINGS=false \
     "${validate_modules}" --exclude '/utilities/|/shippable(/|$)' .