summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven Hiscocks <steven@hiscocks.me.uk>2013-04-13 16:58:05 +0100
committerSteven Hiscocks <steven@hiscocks.me.uk>2013-04-13 17:01:18 +0100
commit9241ded37663988412091b0cb2622eb408bfb61c (patch)
treebdd0011f13e748feceda3b53258b7ac6f04b0a4e
parentd061b2b549445164ad4c3b197e482bf10f220b22 (diff)
downloadfail2ban-9241ded37663988412091b0cb2622eb408bfb61c.tar.gz
TST: Fix up fail2ban python3 scripts
-rwxr-xr-xfail2ban-2to317
-rwxr-xr-xfail2ban-testcases-all-python32
2 files changed, 8 insertions, 11 deletions
diff --git a/fail2ban-2to3 b/fail2ban-2to3
index a6a61090..2015ed5b 100755
--- a/fail2ban-2to3
+++ b/fail2ban-2to3
@@ -5,13 +5,10 @@
set -eu
-nonPyFiles="fail2ban-client fail2ban-server fail2ban-regex fail2ban-testcases"
-
-find . \
- -name "*.py" \
- -exec 2to3 -w --no-diffs $nonPyFiles {} + \
- || (echo "Fail!" >&2 && exit 1)
-
-echo "Success!" >&2
-
-exit 0
+if 2to3 -w --no-diffs bin/* fail2ban;then
+ echo "Success!" >&2
+ exit 0
+else
+ echo "Fail!" >&2
+ exit 1
+fi
diff --git a/fail2ban-testcases-all-python3 b/fail2ban-testcases-all-python3
index fd3ff871..9445f396 100755
--- a/fail2ban-testcases-all-python3
+++ b/fail2ban-testcases-all-python3
@@ -9,7 +9,7 @@ for python in /usr/{,local/}bin/python3.[0-9]{,.*}{,-dbg}
do
[ -e "$python" ] || continue
echo "Testing using $python"
- $python ./fail2ban-testcases "$@" || failed+=" $python"
+ $python bin/fail2ban-testcases "$@" || failed+=" $python"
done
if [ ! -z "$failed" ]; then