Avoid creating ssl context if connecting to a Unix socket

elprans · elprans · commit 03ecc2f2046e · 2020-11-26T18:37:13.000-08:00
diff --git a/tests/test_connect.py b/tests/test_connect.py
@@ -547,6 +547,7 @@ class TestConnectParams(tb.TestCase):
                 {
                     'user': 'user',
                     'database': 'user',
+                    'ssl': None
                 }
             )
         },
@@ -576,7 +577,9 @@ class TestConnectParams(tb.TestCase):
                     ('localhost', 5433)
                 ], {
                     'user': 'spam',
-                    'database': 'db'
+                    'database': 'db',
+                    'ssl': True,
+                    'ssl_is_advisory': True
                 }
             )
         },
@@ -646,7 +649,8 @@ def run_testcase(self, testcase):
                 connect_timeout=None, server_settings=server_settings)
 
             params = {
-                k: v for k, v in params._asdict().items() if v is not None
+                k: v for k, v in params._asdict().items()
+                if v is not None or (expected is not None and k in expected[1])
             }
 
             if isinstance(params.get('ssl'), ssl.SSLContext):

Original file line number	Diff line number	Diff line change
`@@ -547,6 +547,7 @@ class TestConnectParams(tb.TestCase):`
`547`	`547`	`{`
`548`	`548`	`'user': 'user',`
`549`	`549`	`'database': 'user',`
	`550`	`+ 'ssl': None`
`550`	`551`	`}`
`551`	`552`	`)`
`552`	`553`	`},`
`@@ -576,7 +577,9 @@ class TestConnectParams(tb.TestCase):`
`576`	`577`	`('localhost', 5433)`
`577`	`578`	`], {`
`578`	`579`	`'user': 'spam',`
`579`		`- 'database': 'db'`
	`580`	`+ 'database': 'db',`
	`581`	`+ 'ssl': True,`
	`582`	`+ 'ssl_is_advisory': True`
`580`	`583`	`}`
`581`	`584`	`)`
`582`	`585`	`},`
`@@ -646,7 +649,8 @@ def run_testcase(self, testcase):`
`646`	`649`	`connect_timeout=None, server_settings=server_settings)`
`647`	`650`
`648`	`651`	`params = {`
`649`		`- k: v for k, v in params._asdict().items() if v is not None`
	`652`	`+ k: v for k, v in params._asdict().items()`
	`653`	`+ if v is not None or (expected is not None and k in expected[1])`
`650`	`654`	`}`
`651`	`655`
`652`	`656`	`if isinstance(params.get('ssl'), ssl.SSLContext):`