[Git][reproducible-builds/diffoscope][master] 2 commits: debian: add black to the test dependencies

[Mattia Rizzolo]

Mattia Rizzolo pushed to branch master at Reproducible Builds / diffoscope


Commits:
0eddfab7 by Mattia Rizzolo at 2019-05-20T15:17:00Z
debian: add black to the test dependencies

Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -
2e111824 by Mattia Rizzolo at 2019-05-20T15:28:23Z
debian: enfore the "fail on missing tools" only when testing with all the recommended packages

Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -


3 changed files:

- debian/tests/control
- debian/tests/control.in
- debian/tests/pytest


Changes:

=====================================
debian/tests/control
=====================================
@@ -7,7 +7,7 @@
 #   $ mv debian/tests/control.tmp debian/tests/control
 
 Tests: pytest-with-recommends
-Depends: diffoscope, python3-pytest, file, linux-image-amd64 [amd64] | linux-image-generic [amd64], abootimg, acl, apktool [!ppc64el !s390x], binutils-multiarch, bzip2, caca-utils, colord, db-util, default-jdk-headless | default-jdk | java-sdk, device-tree-compiler, docx2txt, e2fsprogs, enjarify, ffmpeg, fontforge-extras, fp-utils [!ppc64el !s390x], genisoimage, gettext, ghc, ghostscript, giflib-tools, gnumeric, gnupg, gnupg-utils, imagemagick, jsbeautifier, libarchive-tools, llvm, lz4 | liblz4-tool, mono-utils, ocaml-nox, odt2txt, openssh-client, pgpdump, poppler-utils, r-base-core, rpm2cpio, sng, sqlite3, squashfs-tools, tcpdump, unzip, xmlbeans, xxd | vim-common, xz-utils, zip, python3-argcomplete, python3-binwalk, python3-defusedxml, python3-distro, python3-guestfs, python3-jsondiff, python3-progressbar, python3-pypdf2, python3-debian, python3-pyxattr, python3-rpm, python3-tlsh
+Depends: diffoscope, black, python3-pytest, file, linux-image-amd64 [amd64] | linux-image-generic [amd64], abootimg, acl, apktool [!ppc64el !s390x], binutils-multiarch, bzip2, caca-utils, colord, db-util, default-jdk-headless | default-jdk | java-sdk, device-tree-compiler, docx2txt, e2fsprogs, enjarify, ffmpeg, fontforge-extras, fp-utils [!ppc64el !s390x], genisoimage, gettext, ghc, ghostscript, giflib-tools, gnumeric, gnupg, gnupg-utils, imagemagick, jsbeautifier, libarchive-tools, llvm, lz4 | liblz4-tool, mono-utils, ocaml-nox, odt2txt, openssh-client, pgpdump, poppler-utils, r-base-core, rpm2cpio, sng, sqlite3, squashfs-tools, tcpdump, unzip, xmlbeans, xxd | vim-common, xz-utils, zip, python3-argcomplete, python3-binwalk, python3-defusedxml, python3-distro, python3-guestfs, python3-jsondiff, python3-progressbar, python3-pypdf2, python3-debian, python3-pyxattr, python3-rpm, python3-tlsh
 
 Tests: pytest
 Depends: diffoscope, python3-pytest, file


=====================================
debian/tests/control.in
=====================================
@@ -4,7 +4,7 @@
 #   $ mv debian/tests/control.tmp debian/tests/control
 
 Tests: pytest-with-recommends
-Depends: diffoscope, python3-pytest, file, linux-image-amd64 [amd64] | linux-image-generic [amd64], %RECOMMENDS%, %PYRECOMMENDS%
+Depends: diffoscope, black, python3-pytest, file, linux-image-amd64 [amd64] | linux-image-generic [amd64], %RECOMMENDS%, %PYRECOMMENDS%
 
 Tests: pytest
 Depends: diffoscope, python3-pytest, file


=====================================
debian/tests/pytest
=====================================
@@ -8,7 +8,9 @@ if ! [ -d "$ADTTMP" ]; then
 fi
 
 export LIBGUESTFS_MEMSIZE=128
-export DIFFOSCOPE_TESTS_FAIL_ON_MISSING_TOOLS=1
+if [ "$(basename "$0")" = "pytest-with-recommends" ]; then
+    export DIFFOSCOPE_TESTS_FAIL_ON_MISSING_TOOLS=1
+fi
 
-cp -r tests $ADTTMP
-(cd $ADTTMP; py.test-3 -vv -l -r a)
+cp -r tests "$ADTTMP"
+(cd "$ADTTMP"; py.test-3 -vv -l -r a)



View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/compare/8f67fcb3887eceba2b96cdb83943cb69318832b4...2e111824754b0bb076adece41c2e18f821a24b30

-- 
View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/compare/8f67fcb3887eceba2b96cdb83943cb69318832b4...2e111824754b0bb076adece41c2e18f821a24b30
You're receiving this email because of your account on salsa.debian.org.

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.reproducible-builds.org/pipermail/rb-commits/attachments/20190520/18e4c44c/attachment.html>