From 3ba11716c10d285f0373c2dfc3650c0af453896b Mon Sep 17 00:00:00 2001 From: Ben Sturmfels Date: Tue, 9 Mar 2021 16:56:28 +1100 Subject: [PATCH] Run LDAP, OpenID and PDF tests under Docker. --- .builds/debian-10-with-site-packages.yml | 8 +++++++- .builds/fedora-33-with-site-packages.yml | 6 ++++++ Dockerfile-debian-python3-sqlite | 9 ++++++++- Dockerfile-fedora-python3-sqlite | 14 ++++++++++++-- mediagoblin/plugins/openid/README.rst | 2 +- mediagoblin/tests/test_submission/good.pdf | Bin 44 -> 8899 bytes 6 files changed, 34 insertions(+), 5 deletions(-) mode change 120000 => 100644 mediagoblin/tests/test_submission/good.pdf diff --git a/.builds/debian-10-with-site-packages.yml b/.builds/debian-10-with-site-packages.yml index 8b8760a7..1f672a6b 100644 --- a/.builds/debian-10-with-site-packages.yml +++ b/.builds/debian-10-with-site-packages.yml @@ -43,7 +43,13 @@ packages: # Install document (PDF-only) dependencies. - poppler-utils - + + # Install LDAP depedencies. + - python3-ldap + + # Install OpenID dependencies. + - python3-openid + tasks: - core: | cd mediagoblin diff --git a/.builds/fedora-33-with-site-packages.yml b/.builds/fedora-33-with-site-packages.yml index 562441fd..0a0fce34 100644 --- a/.builds/fedora-33-with-site-packages.yml +++ b/.builds/fedora-33-with-site-packages.yml @@ -45,6 +45,12 @@ packages: # # Install document (PDF-only) dependencies. # - poppler-utils + + # Install LDAP depedencies. + - python3-ldap + + # Install OpenID dependencies. + - python3-openid tasks: - core: | diff --git a/Dockerfile-debian-python3-sqlite b/Dockerfile-debian-python3-sqlite index 8f38879c..bf22b9cf 100644 --- a/Dockerfile-debian-python3-sqlite +++ b/Dockerfile-debian-python3-sqlite @@ -112,6 +112,12 @@ libboost-python-dev RUN apt-get install -y \ poppler-utils +# Install LDAP depedencies. +RUN apt-get install -y python3-ldap + +# Install OpenID dependencies. +RUN apt-get install -y python3-openid + # Create working directory. RUN mkdir /opt/mediagoblin RUN chown -R www-data:www-data /opt/mediagoblin @@ -167,7 +173,8 @@ RUN make RUN ./bin/pip install py3exiv2 # Run the tests. -RUN ./bin/python -m pytest ./mediagoblin/tests --boxed +RUN echo foo +RUN ./bin/python -m pytest -rs ./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 72f2874d..be7f30a7 100644 --- a/Dockerfile-fedora-python3-sqlite +++ b/Dockerfile-fedora-python3-sqlite @@ -60,6 +60,15 @@ gstreamer1-plugin-openh264 # RUN apt-get install -y \ # poppler-utils +# Install raw image dependencies. +# TODO + +# Install LDAP depedencies. +RUN dnf -y install python3-ldap + +# Install OpenID dependencies. +RUN dnf -y install python3-openid + RUN groupadd www-data RUN groupadd --system mediagoblin --gid 1024 RUN adduser www-data -g www-data -G mediagoblin @@ -73,14 +82,15 @@ RUN chown root:www-data /var/www USER www-data -RUN git clone --depth=1 https://git.sr.ht/~mediagoblin/mediagoblin --branch ci . +RUN git clone --depth=1 git://git.savannah.gnu.org/mediagoblin.git --branch master . RUN git show --oneline --no-patch RUN ./bootstrap.sh RUN VIRTUALENV_FLAGS='--system-site-packages' ./configure RUN make -RUN ./bin/python -m pytest ./mediagoblin/tests --boxed +RUN echo foo +RUN ./bin/python -m pytest -rs ./mediagoblin/tests --boxed RUN echo '[[mediagoblin.media_types.audio]]' >> mediagoblin.ini RUN echo '[[mediagoblin.media_types.video]]' >> mediagoblin.ini diff --git a/mediagoblin/plugins/openid/README.rst b/mediagoblin/plugins/openid/README.rst index 1a777336..e2792d9a 100644 --- a/mediagoblin/plugins/openid/README.rst +++ b/mediagoblin/plugins/openid/README.rst @@ -20,7 +20,7 @@ This plugin can be enabled alongside :ref:`basic_auth-chapter` and Set up the OpenID plugin ============================ -1. Install the ``python-openid`` package. +1. Install the ``python3-openid`` package. 2. Add the following to your MediaGoblin .ini file in the ``[plugins]`` section:: diff --git a/mediagoblin/tests/test_submission/good.pdf b/mediagoblin/tests/test_submission/good.pdf deleted file mode 120000 index d7029f36..00000000 --- a/mediagoblin/tests/test_submission/good.pdf +++ /dev/null @@ -1 +0,0 @@ -../../../docs/build/latex/GNUMediaGoblin.pdf \ No newline at end of file diff --git a/mediagoblin/tests/test_submission/good.pdf b/mediagoblin/tests/test_submission/good.pdf new file mode 100644 index 0000000000000000000000000000000000000000..13f6fa17c0e8cc79ae59bab376e65efa6fbc96e0 GIT binary patch literal 8899 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