Unverified Commit 7917b746 authored by Mattia Rizzolo's avatar Mattia Rizzolo
Browse files

test: skip the OpenSSH test with DSA key if openssh is >> 9.7 

newer versions are very likely to not be compiled with DSA support

See #382


and also commit 0743d63f

Signed-off-by: Mattia Rizzolo's avatarMattia Rizzolo <mattia@debian.org>
parent 652b5793

tests/comparators/test_openssh_pub_key.py

+6 −1
Original line number Diff line number Diff line
@@ -26,7 +26,11 @@ from diffoscope.comparators.openssh import PublicKeyFile 
from diffoscope.comparators.missing_file import MissingFile



from ..utils.data import assert_diff, load_fixture

from ..utils.tools import skip_unless_tools_exist, skip_unless_tool_is_at_least

from ..utils.tools import (

    skip_unless_tools_exist,

    skip_unless_tool_is_at_least,

    skip_unless_tool_is_at_most,

)





# Generated by: ssh-keygen -t dsa -C "Test1"
@@ -70,6 +74,7 @@ def differences23(opensshpubkey2, opensshpubkey3): 




@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")

tests/utils/versions.py

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
# You should have received a copy of the GNU General Public License

# along with diffoscope.  If not, see <https://www.gnu.org/licenses/>.



import itertools

import functools

import string