diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2022-04-25 08:15:42 -0400 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2022-04-25 08:15:42 -0400 |
| commit | d9eb35c69ab29a1ad7a9e3dd5325d4cab9dd2bc0 (patch) | |
| tree | bfa73aede87b442db84627cbe9075d3082a1601f /tests | |
| parent | 9151b5a5ef6634142cc810193a59630c863549c3 (diff) | |
| parent | 47529be4385cffba6851f10e505f5683290d116e (diff) | |
| download | paramiko-d9eb35c69ab29a1ad7a9e3dd5325d4cab9dd2bc0.tar.gz | |
Merge branch '2.10'
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test_pkey.py | 5 | ||||
| -rw-r--r-- | tests/test_transport.py | 8 |
2 files changed, 12 insertions, 1 deletions
diff --git a/tests/test_pkey.py b/tests/test_pkey.py index 44ab688f..738e8cf0 100644 --- a/tests/test_pkey.py +++ b/tests/test_pkey.py @@ -626,6 +626,11 @@ class KeyTest(unittest.TestCase): for key1, key2 in self.keys(): assert key1 == key2 + def test_keys_are_not_equal_to_other(self): + for value in [None, True, ""]: + for key1, _ in self.keys(): + assert key1 != value + def test_keys_are_hashable(self): # NOTE: this isn't a great test due to hashseed randomization under # Python 3 preventing use of static values, but it does still prove diff --git a/tests/test_transport.py b/tests/test_transport.py index 52a49b0e..8e5f8cd7 100644 --- a/tests/test_transport.py +++ b/tests/test_transport.py @@ -1121,7 +1121,12 @@ class AlgorithmDisablingTests(unittest.TestCase): t = Transport(sock=Mock()) assert t.preferred_ciphers == t._preferred_ciphers assert t.preferred_macs == t._preferred_macs - assert t.preferred_keys == t._preferred_keys + assert t.preferred_keys == tuple( + t._preferred_keys + + tuple( + "{}-cert-v01@openssh.com".format(x) for x in t._preferred_keys + ) + ) assert t.preferred_kex == t._preferred_kex def test_preferred_lists_filter_disabled_algorithms(self): @@ -1140,6 +1145,7 @@ class AlgorithmDisablingTests(unittest.TestCase): assert "hmac-md5" not in t.preferred_macs assert "ssh-dss" in t._preferred_keys assert "ssh-dss" not in t.preferred_keys + assert "ssh-dss-cert-v01@openssh.com" not in t.preferred_keys assert "diffie-hellman-group14-sha256" in t._preferred_kex assert "diffie-hellman-group14-sha256" not in t.preferred_kex |