diff options
| author | mieciu <przemyslaw.hejman@gmail.com> | 2016-06-02 14:03:03 -0700 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2016-06-03 12:42:41 -0400 |
| commit | 9a204fc8a52d79942325ed984d48e5aef5b64d21 (patch) | |
| tree | 4015078c29cbaec05cebafd372d7dfe9f73cb4b9 /tests/dbshell | |
| parent | 521772ff0779ced13f94a6ebcd96740a9eafbb1d (diff) | |
[1.10.x] Fixed #26698 -- Fixed PostgreSQL dbshell crash on an empty database name.
Backport of 19ff506878071ac93de684fe01328707e75e2b3a from master
Diffstat (limited to 'tests/dbshell')
| -rw-r--r-- | tests/dbshell/test_postgresql_psycopg2.py | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/tests/dbshell/test_postgresql_psycopg2.py b/tests/dbshell/test_postgresql_psycopg2.py index f74ea3ddb2..c75db4b188 100644 --- a/tests/dbshell/test_postgresql_psycopg2.py +++ b/tests/dbshell/test_postgresql_psycopg2.py @@ -37,11 +37,11 @@ class PostgreSqlDbshellCommandTestCase(SimpleTestCase): def test_basic(self): self.assertEqual( self._run_it({ - 'NAME': 'dbname', - 'USER': 'someuser', - 'PASSWORD': 'somepassword', - 'HOST': 'somehost', - 'PORT': 444, + 'database': 'dbname', + 'user': 'someuser', + 'password': 'somepassword', + 'host': 'somehost', + 'port': '444', }), ( ['psql', '-U', 'someuser', '-h', 'somehost', '-p', '444', 'dbname'], b'somehost:444:dbname:someuser:somepassword', @@ -51,10 +51,10 @@ class PostgreSqlDbshellCommandTestCase(SimpleTestCase): def test_nopass(self): self.assertEqual( self._run_it({ - 'NAME': 'dbname', - 'USER': 'someuser', - 'HOST': 'somehost', - 'PORT': 444, + 'database': 'dbname', + 'user': 'someuser', + 'host': 'somehost', + 'port': '444', }), ( ['psql', '-U', 'someuser', '-h', 'somehost', '-p', '444', 'dbname'], None, @@ -64,11 +64,11 @@ class PostgreSqlDbshellCommandTestCase(SimpleTestCase): def test_column(self): self.assertEqual( self._run_it({ - 'NAME': 'dbname', - 'USER': 'some:user', - 'PASSWORD': 'some:password', - 'HOST': '::1', - 'PORT': 444, + 'database': 'dbname', + 'user': 'some:user', + 'password': 'some:password', + 'host': '::1', + 'port': '444', }), ( ['psql', '-U', 'some:user', '-h', '::1', '-p', '444', 'dbname'], b'\\:\\:1:444:dbname:some\\:user:some\\:password', @@ -78,11 +78,11 @@ class PostgreSqlDbshellCommandTestCase(SimpleTestCase): def test_escape_characters(self): self.assertEqual( self._run_it({ - 'NAME': 'dbname', - 'USER': 'some\\user', - 'PASSWORD': 'some\\password', - 'HOST': 'somehost', - 'PORT': 444, + 'database': 'dbname', + 'user': 'some\\user', + 'password': 'some\\password', + 'host': 'somehost', + 'port': '444', }), ( ['psql', '-U', 'some\\user', '-h', 'somehost', '-p', '444', 'dbname'], b'somehost:444:dbname:some\\\\user:some\\\\password', @@ -106,11 +106,11 @@ class PostgreSqlDbshellCommandTestCase(SimpleTestCase): self.skipTest("Your locale can't run this test.") self.assertEqual( self._run_it({ - 'NAME': 'dbname', - 'USER': username_str, - 'PASSWORD': password_str, - 'HOST': 'somehost', - 'PORT': 444, + 'database': 'dbname', + 'user': username_str, + 'password': password_str, + 'host': 'somehost', + 'port': '444', }), ( ['psql', '-U', username_str, '-h', 'somehost', '-p', '444', 'dbname'], pgpass_bytes, |