change 'disable hostname checking' elif condition

MSLNZ · Sep 21, 2023 · 0bd8f4d · 0bd8f4d
1 parent e536e73
commit 0bd8f4d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/msl/network/network.py b/msl/network/network.py
@@ -413,7 +413,7 @@ def _create_connection(self, **kwargs):
                 msg = 'Cannot connect to {host}:{port}'.format(**kwargs)
             elif isinstance(error, (ConnectionRefusedError, socket.gaierror)):
                 msg += '\nCannot connect to {host}:{port}'.format(**kwargs)
-            elif 'mismatch' in msg or "doesn't match" in msg:
+            elif ('name mismatch' in msg) or ('address mismatch' in msg):
                 msg += '\nTo disable hostname checking set assert_hostname=False\n' \
                        'Make sure you trust the connection to {host}:{port} ' \
                        'if you decide to do this.'.format(**kwargs)

diff --git a/tests/test_connect.py b/tests/test_connect.py
@@ -98,7 +98,7 @@ def test_wrong_certificate():
     assert cryptography.generate_certificate(path=cert, key_path=key) == cert
     kwargs = manager.kwargs.copy()
     kwargs['cert_file'] = cert
-    with pytest.raises((ConnectionError, AssertionError)) as e:
+    with pytest.raises(ConnectionError) as e:
         connect(**kwargs)
     msg = str(e.value)
     assert 'Perhaps the Network Manager is using a new certificate' in msg