[Git][reproducible-builds/diffoscope][master] 2 commits: Mark some PGP tests that they require pgpdump. Thanks to Gianfranco Costamagna...

[Chris Lamb]

Chris Lamb pushed to branch master at Reproducible Builds / diffoscope


Commits:
4d60897d by Chris Lamb at 2020-09-08T12:46:21+01:00
Mark some PGP tests that they require pgpdump. Thanks to Gianfranco Costamagna (locutusofborg). (Closes: #969753)

- - - - -
c6a438a0 by Chris Lamb at 2020-09-11T09:46:50+01:00
Add some documentation for the EXTERNAL_TOOLS dictionary. (Re: reproducible-builds/diffoscope!56)

- - - - -


2 changed files:

- diffoscope/external_tools.py
- tests/comparators/test_pgp.py


Changes:

=====================================
diffoscope/external_tools.py
=====================================
@@ -17,6 +17,11 @@
 # You should have received a copy of the GNU General Public License
 # along with diffoscope.  If not, see <https://www.gnu.org/licenses/>.
 
+"""
+The keys of this dictionary are filenames of executables (eg. `abootimg`)
+that might resolve to, for example, `/usr/bin/abootimg`.
+"""
+
 EXTERNAL_TOOLS = {
     "abootimg": {"debian": "abootimg", "guix": "abootimg"},
     "apktool": {"debian": "apktool"},


=====================================
tests/comparators/test_pgp.py
=====================================
@@ -70,6 +70,7 @@ def test_pgp_signature(signature1, signature2):
     assert len(difference.details) == 1
 
 
+ at skip_unless_tools_exist("pgpdump")
 def test_signed_identification(signed1):
     assert isinstance(signed1, PgpFile)
 



View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/compare/acb839c3afc555d87917feed9a220a2d5557a71a...c6a438a0d2bb145dc94ebbea4200d1b23649ab09

-- 
View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/compare/acb839c3afc555d87917feed9a220a2d5557a71a...c6a438a0d2bb145dc94ebbea4200d1b23649ab09
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/20200911/f573946a/attachment.htm>