Fix tests after repo merge.

3 files changed, 4 insertions, 7 deletions

diff --git a/test/sanity/code-smell/boilerplate.sh b/test/sanity/code-smell/boilerplate.sh
index 213893901a..b9d67ed4ec 100755
--- a/test/sanity/code-smell/boilerplate.sh
+++ b/test/sanity/code-smell/boilerplate.sh
@@ -3,17 +3,15 @@
 metaclass1=$(find ./bin -type f -exec grep -HL '__metaclass__ = type' '{}' '+')
 future1=$(find ./bin -type f -exec grep -HL 'from __future__ import (absolute_import, division, print_function)' '{}' '+')
 
-metaclass2=$(find ./lib/ansible -path ./lib/ansible/modules/core -prune \
+metaclass2=$(find ./lib/ansible -path ./lib/ansible/modules -prune \
         -o -path ./lib/ansible/modules/__init__.py \
-        -o -path ./lib/ansible/modules/extras -prune \
         -o -path ./lib/ansible/module_utils -prune \
         -o -path ./lib/ansible/compat/six/_six.py -prune \
         -o -path ./lib/ansible/utils/module_docs_fragments -prune \
         -o -name '*.py' -exec grep -HL '__metaclass__ = type' '{}' '+')
 
-future2=$(find ./lib/ansible -path ./lib/ansible/modules/core -prune \
+future2=$(find ./lib/ansible -path ./lib/ansible/modules -prune \
         -o -path ./lib/ansible/modules/__init__.py \
-        -o -path ./lib/ansible/modules/extras -prune \
         -o -path ./lib/ansible/module_utils -prune \
         -o -path ./lib/ansible/compat/six/_six.py -prune \
         -o -path ./lib/ansible/utils/module_docs_fragments -prune \
diff --git a/test/sanity/code-smell/no-basestring.sh b/test/sanity/code-smell/no-basestring.sh
index d1068a989b..c8d97e4910 100755
--- a/test/sanity/code-smell/no-basestring.sh
+++ b/test/sanity/code-smell/no-basestring.sh
@@ -8,8 +8,7 @@ BASESTRING_USERS=$(grep -r basestring . \
     -e test/results/ \
     -e lib/ansible/compat/six/_six.py \
     -e lib/ansible/module_utils/six.py \
-    -e lib/ansible/modules/core/ \
-    -e lib/ansible/modules/extras/ \
+    -e lib/ansible/modules/ \
     -e '^[^:]*:#'
     )
 
diff --git a/test/sanity/code-smell/use-compat-six.sh b/test/sanity/code-smell/use-compat-six.sh
index 0fa120e82a..c77ad7c7ec 100755
--- a/test/sanity/code-smell/use-compat-six.sh
+++ b/test/sanity/code-smell/use-compat-six.sh
@@ -6,7 +6,7 @@ BASEDIR=${1-"lib"}
 # digital_ocean is checking for six because dopy doesn't specify the
 #   requirement on six so it needs to try importing six to give the correct error
 #   message
-WHITELIST='(lib/ansible/modules/core/cloud/digital_ocean/digital_ocean.py)'
+WHITELIST='(lib/ansible/modules/cloud/digital_ocean/digital_ocean.py)'
 
 SIX_USERS=$(find "$BASEDIR" -name '*.py' -exec grep -wH six '{}' '+' \
     | grep import \