summaryrefslogtreecommitdiff
path: root/contrib/python/podman
diff options
context:
space:
mode:
Diffstat (limited to 'contrib/python/podman')
-rw-r--r--contrib/python/podman/MANIFEST.in1
-rwxr-xr-xcontrib/python/podman/test/test_runner.sh12
-rw-r--r--contrib/python/podman/tox.ini8
3 files changed, 9 insertions, 12 deletions
diff --git a/contrib/python/podman/MANIFEST.in b/contrib/python/podman/MANIFEST.in
index 72e638cb9..a5897de50 100644
--- a/contrib/python/podman/MANIFEST.in
+++ b/contrib/python/podman/MANIFEST.in
@@ -1,2 +1,3 @@
prune test/
include README.md
+include requirements.txt
diff --git a/contrib/python/podman/test/test_runner.sh b/contrib/python/podman/test/test_runner.sh
index 081b90779..65cbd1e9c 100755
--- a/contrib/python/podman/test/test_runner.sh
+++ b/contrib/python/podman/test/test_runner.sh
@@ -143,18 +143,6 @@ else
RETURNCODE=$?
fi
-if [[ "$RETURNCODE" -ne 0 ]] && [[ -n "$FLAKE_DEBUG_DELAY" ]]
-then
- cat << EOF > /dev/stderr
-*****
-***** WARNING: \$FLAKE_DEBUG_DELAY IS SET AND PYTHON-PODMAN TESTS EXITED: $RETURNCODE
-***** WARNING: Sleeping for 30 minutes for test-VM preservation oportunity.
-*****
-EOF
- sleep 30m
-fi
-
-
pkill -9 podman
pkill -9 conmon
diff --git a/contrib/python/podman/tox.ini b/contrib/python/podman/tox.ini
new file mode 100644
index 000000000..797eafbe3
--- /dev/null
+++ b/contrib/python/podman/tox.ini
@@ -0,0 +1,8 @@
+[tox]
+envlist = py34,py35,py36
+skipdist = True
+
+[testenv]
+deps=-rrequirements.txt
+whitelist_externals = bash
+commands=bash test/test_runner.sh