From 18372712592b30638772afb5b7e15bfca92c2058 Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn@redhat.com>
Date: Mon, 23 Feb 2015 22:56:55 +0100
Subject: TESTS: Run python tests with all supported python versions

This patch add simple bash wrappers for python tests.
They are executed either with python2 or python3.

Reviewed-by: Stephen Gallagher <sgallagh@redhat.com>
---
 Makefile.am                        | 23 ++++++++++++++++++-----
 src/config/SSSDConfigTest.py2.sh   |  5 +++++
 src/config/SSSDConfigTest.py3.sh   |  5 +++++
 src/tests/pyhbac-test.py2.sh       |  5 +++++
 src/tests/pyhbac-test.py3.sh       |  5 +++++
 src/tests/pysss_murmur-test.py2.sh |  5 +++++
 src/tests/pysss_murmur-test.py3.sh |  5 +++++
 7 files changed, 48 insertions(+), 5 deletions(-)
 create mode 100755 src/config/SSSDConfigTest.py2.sh
 create mode 100755 src/config/SSSDConfigTest.py3.sh
 create mode 100755 src/tests/pyhbac-test.py2.sh
 create mode 100755 src/tests/pyhbac-test.py3.sh
 create mode 100755 src/tests/pysss_murmur-test.py2.sh
 create mode 100755 src/tests/pysss_murmur-test.py3.sh

diff --git a/Makefile.am b/Makefile.am
index f560f7af4..ee23a4111 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -250,13 +250,20 @@ endif # HAVE_CMOCKA
 
 PYTHON_TESTS =
 
-if BUILD_PYTHON_BINDINGS
-PYTHON_TESTS += src/config/SSSDConfigTest.py \
-                src/tests/pyhbac-test.py \
-                src/tests/pysss_murmur-test.py
+if BUILD_PYTHON2_BINDINGS
+PYTHON_TESTS += src/config/SSSDConfigTest.py2.sh \
+                src/tests/pyhbac-test.py2.sh \
+                src/tests/pysss_murmur-test.py2.sh \
+                $(NULL)
+endif
+if BUILD_PYTHON3_BINDINGS
+PYTHON_TESTS += src/config/SSSDConfigTest.py3.sh \
+                src/tests/pyhbac-test.py3.sh \
+                src/tests/pysss_murmur-test.py3.sh \
+                $(NULL)
 endif
 
-TEST_EXTENSIONS = .py
+TEST_EXTENSIONS = .sh
 TESTS = \
     $(PYTHON_TESTS) \
     $(non_interactive_cmocka_based_tests) \
@@ -325,6 +332,8 @@ dist_noinst_SCRIPTS = \
     src/config/SSSDConfig/ipachangeconf.py \
     src/config/SSSDConfig/__init__.py \
     src/config/SSSDConfigTest.py \
+    src/config/SSSDConfigTest.py2.sh \
+    src/config/SSSDConfigTest.py3.sh \
     src/config/SSSDConfig/sssd_upgrade_config.py \
     contrib/rhel/update_debug_levels.py \
     contrib/fedora/bashrc_sssd \
@@ -335,7 +344,11 @@ dist_noinst_SCRIPTS = \
     contrib/ci/run \
     contrib/ci/valgrind-condense \
     src/tests/pyhbac-test.py \
+    src/tests/pyhbac-test.py2.sh \
+    src/tests/pyhbac-test.py3.sh \
     src/tests/pysss_murmur-test.py \
+    src/tests/pysss_murmur-test.py2.sh \
+    src/tests/pysss_murmur-test.py3.sh \
     src/tests/python-test.py \
     $(NULL)
 
diff --git a/src/config/SSSDConfigTest.py2.sh b/src/config/SSSDConfigTest.py2.sh
new file mode 100755
index 000000000..7bbd82af3
--- /dev/null
+++ b/src/config/SSSDConfigTest.py2.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+SCRIPT=$(readlink -f "$0")
+SCRIPT_PATH=$(dirname "$SCRIPT")
+exec python2 $SCRIPT_PATH/SSSDConfigTest.py
diff --git a/src/config/SSSDConfigTest.py3.sh b/src/config/SSSDConfigTest.py3.sh
new file mode 100755
index 000000000..89b9f0720
--- /dev/null
+++ b/src/config/SSSDConfigTest.py3.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+SCRIPT=$(readlink -f "$0")
+SCRIPT_PATH=$(dirname "$SCRIPT")
+exec python3 $SCRIPT_PATH/SSSDConfigTest.py
diff --git a/src/tests/pyhbac-test.py2.sh b/src/tests/pyhbac-test.py2.sh
new file mode 100755
index 000000000..48cd16908
--- /dev/null
+++ b/src/tests/pyhbac-test.py2.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+SCRIPT=$(readlink -f "$0")
+SCRIPT_PATH=$(dirname "$SCRIPT")
+exec python2 $SCRIPT_PATH/pyhbac-test.py
diff --git a/src/tests/pyhbac-test.py3.sh b/src/tests/pyhbac-test.py3.sh
new file mode 100755
index 000000000..862c7b23a
--- /dev/null
+++ b/src/tests/pyhbac-test.py3.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+SCRIPT=$(readlink -f "$0")
+SCRIPT_PATH=$(dirname "$SCRIPT")
+exec python3 $SCRIPT_PATH/pyhbac-test.py
diff --git a/src/tests/pysss_murmur-test.py2.sh b/src/tests/pysss_murmur-test.py2.sh
new file mode 100755
index 000000000..714459786
--- /dev/null
+++ b/src/tests/pysss_murmur-test.py2.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+SCRIPT=$(readlink -f "$0")
+SCRIPT_PATH=$(dirname "$SCRIPT")
+exec python2 $SCRIPT_PATH/pysss_murmur-test.py
diff --git a/src/tests/pysss_murmur-test.py3.sh b/src/tests/pysss_murmur-test.py3.sh
new file mode 100755
index 000000000..00b352ad3
--- /dev/null
+++ b/src/tests/pysss_murmur-test.py3.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+SCRIPT=$(readlink -f "$0")
+SCRIPT_PATH=$(dirname "$SCRIPT")
+exec python3 $SCRIPT_PATH/pysss_murmur-test.py
-- 
cgit