From fa1b4315a14925999aca9b7292e5ee454fa6c280 Mon Sep 17 00:00:00 2001 From: Ben Sturmfels Date: Sat, 6 Mar 2021 11:49:56 +1100 Subject: [PATCH] Re-enable tests in Dockerfiles. --- Dockerfile-debian-python3-sqlite | 10 ++++++---- Dockerfile-fedora-python3-sqlite | 2 ++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Dockerfile-debian-python3-sqlite b/Dockerfile-debian-python3-sqlite index 93f3db4d..0785a18e 100644 --- a/Dockerfile-debian-python3-sqlite +++ b/Dockerfile-debian-python3-sqlite @@ -6,11 +6,13 @@ # # To build this Docker image, run: # -# docker build -t mediagoblin-python3 -f Dockerfile-debian-python3-sqlite . # or -# docker build -t mediagoblin-python3 - < Dockerfile-debian-python3-sqlite # with no build context +# docker build -t mediagoblin-python3 - < Dockerfile-debian-python3-sqlite # # The "- < Dockerfile" format advises Docker not to include the current -# directory as build context. +# directory as build context. Alternatively the following provides build +# context: +# +# docker build -t mediagoblin-python3 -f Dockerfile-debian-python3-sqlite . # # Before running the image you first need to first assign the "mediagoblin" and # "user_dev" directories to an artificial group (1024) on the host that is @@ -147,7 +149,7 @@ RUN VIRTUALENV_FLAGS='--system-site-packages' ./configure RUN make # Run the tests. -# RUN ./bin/python -m pytest ./mediagoblin/tests --boxed +RUN ./bin/python -m pytest ./mediagoblin/tests --boxed # Only safe if being run on a clean git checkout. Otherwise you may have already # customised mediagoblin.ini to already install these. diff --git a/Dockerfile-fedora-python3-sqlite b/Dockerfile-fedora-python3-sqlite index 32ecf858..a58e125e 100644 --- a/Dockerfile-fedora-python3-sqlite +++ b/Dockerfile-fedora-python3-sqlite @@ -73,6 +73,8 @@ RUN ./bootstrap.sh RUN VIRTUALENV_FLAGS='--system-site-packages' ./configure RUN make +RUN ./bin/python -m pytest ./mediagoblin/tests --boxed + # RUN echo '[[mediagoblin.media_types.audio]]' >> mediagoblin.ini # RUN echo '[[mediagoblin.media_types.video]]' >> mediagoblin.ini