summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xtest/Dockerfile_focal2
-rwxr-xr-xtest/run.sh2
-rwxr-xr-xtest_docker.sh16
3 files changed, 18 insertions, 2 deletions
diff --git a/test/Dockerfile_focal b/test/Dockerfile_focal
index c9e4049..61f6745 100755
--- a/test/Dockerfile_focal
+++ b/test/Dockerfile_focal
@@ -1,6 +1,6 @@
FROM ubuntu:focal
RUN apt-get update
-RUN apt-get -y install python
+RUN apt-get -y install python2
RUN apt-get -y install python3
RUN apt-get -y install locales
RUN locale-gen en_US.UTF-8
diff --git a/test/run.sh b/test/run.sh
index 04c77b9..9676ee2 100755
--- a/test/run.sh
+++ b/test/run.sh
@@ -6,7 +6,7 @@ export LC_ALL=en_US.UTF-8
THISDIR=`dirname $0`
export PYTHONPATH=${THISDIR}/..
-PYTHONS="python2.7 python3.5 python3.6 python3.7"
+PYTHONS="python2.7 python3.5 python3.6 python3.7 python3.8 python"
for pyver in $PYTHONS; do
if which $pyver > /dev/null; then
diff --git a/test_docker.sh b/test_docker.sh
new file mode 100755
index 0000000..39a2f12
--- /dev/null
+++ b/test_docker.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+# Test with various versions of ubuntu. This more or less re-creates the
+# Travis CI test environment
+
+function TestInContainer {
+ local name="$1"
+ local TAG="python_magic/${name}:latest"
+ docker build -t $TAG -f "test/Dockerfile_${name}" .
+ docker run "python_magic/${name}:latest"
+}
+
+TestInContainer "xenial"
+TestInContainer "bionic"
+TestInContainer "focal"
+