|
5 | 5 | import psycopg2 |
6 | 6 |
|
7 | 7 |
|
8 | | -def psql(identity: str, sql: str, extra=None) -> str: |
| 8 | +def psql(identity: str, sql: str) -> str: |
9 | 9 | """Call `psql` and execute the given SQL statement.""" |
10 | | - if extra is None: |
11 | | - extra = dict() |
12 | 10 | result = subprocess.run( |
13 | 11 | ["psql", "-h", "127.0.0.1", "-p", "5432", "-U", "postgres", "-d", "quickstart", "--quiet", "-c", sql], |
14 | 12 | encoding="utf8", |
15 | | - env={**os.environ, **extra, "PGPASSWORD": identity}, |
| 13 | + env={**os.environ, "PGPASSWORD": identity}, |
16 | 14 | stdout=subprocess.PIPE, |
17 | 15 | stderr=subprocess.PIPE, |
18 | 16 | text=True, |
@@ -267,16 +265,6 @@ def test_failures(self): |
267 | 265 | sql_out = psql(token, "") |
268 | 266 | self.assertEqual(sql_out, "") |
269 | 267 |
|
270 | | - # Connection fails when `ssl` is required |
271 | | - for ssl_mode in ["require", "verify-ca", "verify-full"]: |
272 | | - with self.assertRaises(Exception) as cm: |
273 | | - psql(token, "SELECT * FROM t_uints", extra={"PGSSLMODE": ssl_mode}) |
274 | | - self.assertIn("not support SSL", str(cm.exception)) |
275 | | - |
276 | | - # But works with `ssl` is disabled or optional |
277 | | - for ssl_mode in ["disable", "allow", "prefer"]: |
278 | | - psql(token, "SELECT * FROM t_uints", extra={"PGSSLMODE": ssl_mode}) |
279 | | - |
280 | 268 | # Connection fails with invalid token |
281 | 269 | with self.assertRaises(Exception) as cm: |
282 | 270 | psql("invalid_token", "SELECT * FROM t_uints") |
|
0 commit comments