From 74ac1c2e4a70b68e18073d6bdd820c2c7c15ed5c Mon Sep 17 00:00:00 2001
From: Matt Clay <matt@mystile.com>
Date: Thu, 11 Jan 2018 11:08:40 -0800
Subject: [PATCH] Test cleanup.

---
 test/sanity/code-smell/boilerplate.sh | 16 +++++++--------
 test/sanity/pep8/legacy-ignore.txt    | 29 ---------------------------
 test/sanity/shellcheck/skip.txt       |  2 --
 3 files changed, 7 insertions(+), 40 deletions(-)

diff --git a/test/sanity/code-smell/boilerplate.sh b/test/sanity/code-smell/boilerplate.sh
index 0ed5e07946c..20c6c3f2046 100755
--- a/test/sanity/code-smell/boilerplate.sh
+++ b/test/sanity/code-smell/boilerplate.sh
@@ -71,13 +71,13 @@ printf "\n== Missing __metaclass__ = type ==\n"
 fi
 
 if test -n "$metaclass1" ; then
-  printf "$metaclass1\n"
+  printf "%s\n" "$metaclass1"
 fi
 if test -n "$metaclass2" ; then
-  printf "$metaclass2\n"
+  printf "%s\n" "$metaclass2"
 fi
 if test -n "$metaclass3" ; then
-  printf "$metaclass3\n"
+  printf "%s\n" "$metaclass3"
 fi
 
 if test -n "$future1" -o -n "$future2" -o -n "$future3" ; then
@@ -85,18 +85,16 @@ if test -n "$future1" -o -n "$future2" -o -n "$future3" ; then
 fi
 
 if test -n "$future1" ; then
-  printf "$future1\n"
+  printf "%s\n" "$future1"
 fi
 if test -n "$future2" ; then
-  printf "$future2\n"
+  printf "%s\n" "$future2"
 fi
 if test -n "$future3" ; then
-  printf "$future3\n"
+  printf "%s\n" "$future3"
 fi
 
 if test -n "$future1$future2$future3$metaclass1$metaclass2$metaclass3" ; then
-  failures=$(printf "$future1$future2$future3$metaclass1$metaclass2$metaclass3"| wc -l)
-  failures=$(expr $failures + 2)
-  exit $failures
+  exit 2
 fi
 exit 0
diff --git a/test/sanity/pep8/legacy-ignore.txt b/test/sanity/pep8/legacy-ignore.txt
index 6edef1f5053..e69de29bb2d 100644
--- a/test/sanity/pep8/legacy-ignore.txt
+++ b/test/sanity/pep8/legacy-ignore.txt
@@ -1,29 +0,0 @@
-E123
-E124
-E127
-E128
-E201
-E202
-E203
-E211
-E221
-E222
-E225
-E226
-E227
-E228
-E231
-E241
-E251
-E261
-E262
-E265
-E266
-E301
-E302
-E303
-E502
-E713
-E731
-W391
-W503
diff --git a/test/sanity/shellcheck/skip.txt b/test/sanity/shellcheck/skip.txt
index 4fff0ba6f84..e69de29bb2d 100644
--- a/test/sanity/shellcheck/skip.txt
+++ b/test/sanity/shellcheck/skip.txt
@@ -1,2 +0,0 @@
-hacking/unify_repos.sh
-test/sanity/code-smell/boilerplate.sh