Refs #33476 -- Reformatted code with Black.

This commit is contained in:
django-bot 2022-02-03 20:24:19 +01:00 committed by Mariusz Felisiak
parent f68fa8b45d
commit 9c19aff7c7
1992 changed files with 139577 additions and 96284 deletions

View file

@ -18,128 +18,149 @@ class PostgreSqlDbshellCommandTestCase(SimpleTestCase):
def test_basic(self):
self.assertEqual(
self.settings_to_cmd_args_env({
'NAME': 'dbname',
'USER': 'someuser',
'PASSWORD': 'somepassword',
'HOST': 'somehost',
'PORT': '444',
}), (
['psql', '-U', 'someuser', '-h', 'somehost', '-p', '444', 'dbname'],
{'PGPASSWORD': 'somepassword'},
)
self.settings_to_cmd_args_env(
{
"NAME": "dbname",
"USER": "someuser",
"PASSWORD": "somepassword",
"HOST": "somehost",
"PORT": "444",
}
),
(
["psql", "-U", "someuser", "-h", "somehost", "-p", "444", "dbname"],
{"PGPASSWORD": "somepassword"},
),
)
def test_nopass(self):
self.assertEqual(
self.settings_to_cmd_args_env({
'NAME': 'dbname',
'USER': 'someuser',
'HOST': 'somehost',
'PORT': '444',
}), (
['psql', '-U', 'someuser', '-h', 'somehost', '-p', '444', 'dbname'],
self.settings_to_cmd_args_env(
{
"NAME": "dbname",
"USER": "someuser",
"HOST": "somehost",
"PORT": "444",
}
),
(
["psql", "-U", "someuser", "-h", "somehost", "-p", "444", "dbname"],
None,
)
),
)
def test_ssl_certificate(self):
self.assertEqual(
self.settings_to_cmd_args_env({
'NAME': 'dbname',
'USER': 'someuser',
'HOST': 'somehost',
'PORT': '444',
'OPTIONS': {
'sslmode': 'verify-ca',
'sslrootcert': 'root.crt',
'sslcert': 'client.crt',
'sslkey': 'client.key',
},
}), (
['psql', '-U', 'someuser', '-h', 'somehost', '-p', '444', 'dbname'],
self.settings_to_cmd_args_env(
{
'PGSSLCERT': 'client.crt',
'PGSSLKEY': 'client.key',
'PGSSLMODE': 'verify-ca',
'PGSSLROOTCERT': 'root.crt',
"NAME": "dbname",
"USER": "someuser",
"HOST": "somehost",
"PORT": "444",
"OPTIONS": {
"sslmode": "verify-ca",
"sslrootcert": "root.crt",
"sslcert": "client.crt",
"sslkey": "client.key",
},
}
),
(
["psql", "-U", "someuser", "-h", "somehost", "-p", "444", "dbname"],
{
"PGSSLCERT": "client.crt",
"PGSSLKEY": "client.key",
"PGSSLMODE": "verify-ca",
"PGSSLROOTCERT": "root.crt",
},
)
),
)
def test_service(self):
self.assertEqual(
self.settings_to_cmd_args_env({'OPTIONS': {'service': 'django_test'}}),
(['psql'], {'PGSERVICE': 'django_test'}),
self.settings_to_cmd_args_env({"OPTIONS": {"service": "django_test"}}),
(["psql"], {"PGSERVICE": "django_test"}),
)
def test_passfile(self):
self.assertEqual(
self.settings_to_cmd_args_env({
'NAME': 'dbname',
'USER': 'someuser',
'HOST': 'somehost',
'PORT': '444',
'OPTIONS': {
'passfile': '~/.custompgpass',
},
}),
self.settings_to_cmd_args_env(
{
"NAME": "dbname",
"USER": "someuser",
"HOST": "somehost",
"PORT": "444",
"OPTIONS": {
"passfile": "~/.custompgpass",
},
}
),
(
['psql', '-U', 'someuser', '-h', 'somehost', '-p', '444', 'dbname'],
{'PGPASSFILE': '~/.custompgpass'},
["psql", "-U", "someuser", "-h", "somehost", "-p", "444", "dbname"],
{"PGPASSFILE": "~/.custompgpass"},
),
)
self.assertEqual(
self.settings_to_cmd_args_env({
'OPTIONS': {
'service': 'django_test',
'passfile': '~/.custompgpass',
},
}),
self.settings_to_cmd_args_env(
{
"OPTIONS": {
"service": "django_test",
"passfile": "~/.custompgpass",
},
}
),
(
['psql'], {'PGSERVICE': 'django_test', 'PGPASSFILE': '~/.custompgpass'},
["psql"],
{"PGSERVICE": "django_test", "PGPASSFILE": "~/.custompgpass"},
),
)
def test_column(self):
self.assertEqual(
self.settings_to_cmd_args_env({
'NAME': 'dbname',
'USER': 'some:user',
'PASSWORD': 'some:password',
'HOST': '::1',
'PORT': '444',
}), (
['psql', '-U', 'some:user', '-h', '::1', '-p', '444', 'dbname'],
{'PGPASSWORD': 'some:password'},
)
self.settings_to_cmd_args_env(
{
"NAME": "dbname",
"USER": "some:user",
"PASSWORD": "some:password",
"HOST": "::1",
"PORT": "444",
}
),
(
["psql", "-U", "some:user", "-h", "::1", "-p", "444", "dbname"],
{"PGPASSWORD": "some:password"},
),
)
def test_accent(self):
username = 'rôle'
password = 'sésame'
username = "rôle"
password = "sésame"
self.assertEqual(
self.settings_to_cmd_args_env({
'NAME': 'dbname',
'USER': username,
'PASSWORD': password,
'HOST': 'somehost',
'PORT': '444',
}), (
['psql', '-U', username, '-h', 'somehost', '-p', '444', 'dbname'],
{'PGPASSWORD': password},
)
self.settings_to_cmd_args_env(
{
"NAME": "dbname",
"USER": username,
"PASSWORD": password,
"HOST": "somehost",
"PORT": "444",
}
),
(
["psql", "-U", username, "-h", "somehost", "-p", "444", "dbname"],
{"PGPASSWORD": password},
),
)
def test_parameters(self):
self.assertEqual(
self.settings_to_cmd_args_env({'NAME': 'dbname'}, ['--help']),
(['psql', 'dbname', '--help'], None),
self.settings_to_cmd_args_env({"NAME": "dbname"}, ["--help"]),
(["psql", "dbname", "--help"], None),
)
@skipUnless(connection.vendor == 'postgresql', 'Requires a PostgreSQL connection')
@skipUnless(connection.vendor == "postgresql", "Requires a PostgreSQL connection")
def test_sigint_handler(self):
"""SIGINT is ignored in Python and passed to psql to abort queries."""
def _mock_subprocess_run(*args, **kwargs):
handler = signal.getsignal(signal.SIGINT)
self.assertEqual(handler, signal.SIG_IGN)
@ -147,7 +168,7 @@ class PostgreSqlDbshellCommandTestCase(SimpleTestCase):
sigint_handler = signal.getsignal(signal.SIGINT)
# The default handler isn't SIG_IGN.
self.assertNotEqual(sigint_handler, signal.SIG_IGN)
with mock.patch('subprocess.run', new=_mock_subprocess_run):
with mock.patch("subprocess.run", new=_mock_subprocess_run):
connection.client.runshell([])
# dbshell restores the original handler.
self.assertEqual(sigint_handler, signal.getsignal(signal.SIGINT))
@ -155,11 +176,11 @@ class PostgreSqlDbshellCommandTestCase(SimpleTestCase):
def test_crash_password_does_not_leak(self):
# The password doesn't leak in an exception that results from a client
# crash.
args, env = self.settings_to_cmd_args_env({'PASSWORD': 'somepassword'}, [])
args, env = self.settings_to_cmd_args_env({"PASSWORD": "somepassword"}, [])
if env:
env = {**os.environ, **env}
fake_client = Path(__file__).with_name('fake_client.py')
fake_client = Path(__file__).with_name("fake_client.py")
args[0:1] = [sys.executable, str(fake_client)]
with self.assertRaises(subprocess.CalledProcessError) as ctx:
subprocess.run(args, check=True, env=env)
self.assertNotIn('somepassword', str(ctx.exception))
self.assertNotIn("somepassword", str(ctx.exception))