[Git][reproducible-builds/diffoscope][master] Handle missing openssh-client in autopkgtests

[Chris Lamb (@lamby)]

Chris Lamb pushed to branch master at Reproducible Builds / diffoscope


Commits:
a4fd009a by Colin Watson at 2026-08-02T13:28:00+01:00
Handle missing openssh-client in autopkgtests

Since
https://salsa.debian.org/ssh-team/openssh/-/commit/9e1ec17894b325c3236caea14de7d8298fbd16a6,
openssh-client may be missing from autopkgtest images.  Handle this.

- - - - -


2 changed files:

- debian/tests/pytest
- tests/comparators/test_openssh_pub_key.py


Changes:

=====================================
debian/tests/pytest
=====================================
@@ -9,7 +9,7 @@ fi
 
 export LIBGUESTFS_MEMSIZE=128
 if [ "$(basename "$0")" = "pytest-with-recommends" ]; then
-    export DIFFOSCOPE_FAIL_TESTS_ON_MISSING_TOOLS="aapt2 androguard apktool asar dexdump zipinfo pedump oggDump ppudump otool lipo radare2"
+    export DIFFOSCOPE_FAIL_TESTS_ON_MISSING_TOOLS="aapt2 androguard apktool asar dexdump zipinfo pedump oggDump ppudump otool lipo radare2 ssh"
 fi
 
 for py in $(py3versions -s); do


=====================================
tests/comparators/test_openssh_pub_key.py
=====================================
@@ -72,12 +72,14 @@ def differences23(opensshpubkey2, opensshpubkey3):
     return opensshpubkey2.compare(opensshpubkey3).details
 
 
+ at skip_unless_tools_exist("ssh")
 @skip_unless_tool_is_at_least("ssh-keygen", openssh_version, "6.9")
 @skip_unless_tool_is_at_most("ssh-keygen", openssh_version, "9.7p1")
 def test_diff12(differences12):
     assert_diff(differences12[0], "openssh_pub_key_expected_diff_12")
 
 
+ at skip_unless_tools_exist("ssh")
 @skip_unless_tool_is_at_least("ssh-keygen", openssh_version, "6.9")
 def test_diff23(differences23):
     assert_diff(differences23[0], "openssh_pub_key_expected_diff_23")



View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/a4fd009a8b534525a656f3a0d9ef2b615090a4aa

-- 
View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/a4fd009a8b534525a656f3a0d9ef2b615090a4aa
You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.reproducible-builds.org/pipermail/rb-commits/attachments/20260804/2a2a968a/attachment.htm>