mirror of
https://github.com/django/django.git
synced 2025-09-12 21:46:39 +00:00
Refs #33476 -- Reformatted code with Black.
This commit is contained in:
parent
f68fa8b45d
commit
9c19aff7c7
1992 changed files with 139577 additions and 96284 deletions
|
@ -19,153 +19,165 @@ class MySqlDbshellCommandTestCase(SimpleTestCase):
|
|||
|
||||
def test_basic_params_specified_in_settings(self):
|
||||
expected_args = [
|
||||
'mysql',
|
||||
'--user=someuser',
|
||||
'--host=somehost',
|
||||
'--port=444',
|
||||
'somedbname',
|
||||
"mysql",
|
||||
"--user=someuser",
|
||||
"--host=somehost",
|
||||
"--port=444",
|
||||
"somedbname",
|
||||
]
|
||||
expected_env = {'MYSQL_PWD': 'somepassword'}
|
||||
expected_env = {"MYSQL_PWD": "somepassword"}
|
||||
self.assertEqual(
|
||||
self.settings_to_cmd_args_env({
|
||||
'NAME': 'somedbname',
|
||||
'USER': 'someuser',
|
||||
'PASSWORD': 'somepassword',
|
||||
'HOST': 'somehost',
|
||||
'PORT': 444,
|
||||
'OPTIONS': {},
|
||||
}),
|
||||
self.settings_to_cmd_args_env(
|
||||
{
|
||||
"NAME": "somedbname",
|
||||
"USER": "someuser",
|
||||
"PASSWORD": "somepassword",
|
||||
"HOST": "somehost",
|
||||
"PORT": 444,
|
||||
"OPTIONS": {},
|
||||
}
|
||||
),
|
||||
(expected_args, expected_env),
|
||||
)
|
||||
|
||||
def test_options_override_settings_proper_values(self):
|
||||
settings_port = 444
|
||||
options_port = 555
|
||||
self.assertNotEqual(settings_port, options_port, 'test pre-req')
|
||||
self.assertNotEqual(settings_port, options_port, "test pre-req")
|
||||
expected_args = [
|
||||
'mysql',
|
||||
'--user=optionuser',
|
||||
'--host=optionhost',
|
||||
'--port=%s' % options_port,
|
||||
'optiondbname',
|
||||
"mysql",
|
||||
"--user=optionuser",
|
||||
"--host=optionhost",
|
||||
"--port=%s" % options_port,
|
||||
"optiondbname",
|
||||
]
|
||||
expected_env = {'MYSQL_PWD': 'optionpassword'}
|
||||
for keys in [('database', 'password'), ('db', 'passwd')]:
|
||||
expected_env = {"MYSQL_PWD": "optionpassword"}
|
||||
for keys in [("database", "password"), ("db", "passwd")]:
|
||||
with self.subTest(keys=keys):
|
||||
database, password = keys
|
||||
self.assertEqual(
|
||||
self.settings_to_cmd_args_env({
|
||||
'NAME': 'settingdbname',
|
||||
'USER': 'settinguser',
|
||||
'PASSWORD': 'settingpassword',
|
||||
'HOST': 'settinghost',
|
||||
'PORT': settings_port,
|
||||
'OPTIONS': {
|
||||
database: 'optiondbname',
|
||||
'user': 'optionuser',
|
||||
password: 'optionpassword',
|
||||
'host': 'optionhost',
|
||||
'port': options_port,
|
||||
},
|
||||
}),
|
||||
self.settings_to_cmd_args_env(
|
||||
{
|
||||
"NAME": "settingdbname",
|
||||
"USER": "settinguser",
|
||||
"PASSWORD": "settingpassword",
|
||||
"HOST": "settinghost",
|
||||
"PORT": settings_port,
|
||||
"OPTIONS": {
|
||||
database: "optiondbname",
|
||||
"user": "optionuser",
|
||||
password: "optionpassword",
|
||||
"host": "optionhost",
|
||||
"port": options_port,
|
||||
},
|
||||
}
|
||||
),
|
||||
(expected_args, expected_env),
|
||||
)
|
||||
|
||||
def test_options_non_deprecated_keys_preferred(self):
|
||||
expected_args = [
|
||||
'mysql',
|
||||
'--user=someuser',
|
||||
'--host=somehost',
|
||||
'--port=444',
|
||||
'optiondbname',
|
||||
"mysql",
|
||||
"--user=someuser",
|
||||
"--host=somehost",
|
||||
"--port=444",
|
||||
"optiondbname",
|
||||
]
|
||||
expected_env = {'MYSQL_PWD': 'optionpassword'}
|
||||
expected_env = {"MYSQL_PWD": "optionpassword"}
|
||||
self.assertEqual(
|
||||
self.settings_to_cmd_args_env({
|
||||
'NAME': 'settingdbname',
|
||||
'USER': 'someuser',
|
||||
'PASSWORD': 'settingpassword',
|
||||
'HOST': 'somehost',
|
||||
'PORT': 444,
|
||||
'OPTIONS': {
|
||||
'database': 'optiondbname',
|
||||
'db': 'deprecatedoptiondbname',
|
||||
'password': 'optionpassword',
|
||||
'passwd': 'deprecatedoptionpassword',
|
||||
},
|
||||
}),
|
||||
self.settings_to_cmd_args_env(
|
||||
{
|
||||
"NAME": "settingdbname",
|
||||
"USER": "someuser",
|
||||
"PASSWORD": "settingpassword",
|
||||
"HOST": "somehost",
|
||||
"PORT": 444,
|
||||
"OPTIONS": {
|
||||
"database": "optiondbname",
|
||||
"db": "deprecatedoptiondbname",
|
||||
"password": "optionpassword",
|
||||
"passwd": "deprecatedoptionpassword",
|
||||
},
|
||||
}
|
||||
),
|
||||
(expected_args, expected_env),
|
||||
)
|
||||
|
||||
def test_options_charset(self):
|
||||
expected_args = [
|
||||
'mysql',
|
||||
'--user=someuser',
|
||||
'--host=somehost',
|
||||
'--port=444',
|
||||
'--default-character-set=utf8',
|
||||
'somedbname',
|
||||
"mysql",
|
||||
"--user=someuser",
|
||||
"--host=somehost",
|
||||
"--port=444",
|
||||
"--default-character-set=utf8",
|
||||
"somedbname",
|
||||
]
|
||||
expected_env = {'MYSQL_PWD': 'somepassword'}
|
||||
expected_env = {"MYSQL_PWD": "somepassword"}
|
||||
self.assertEqual(
|
||||
self.settings_to_cmd_args_env({
|
||||
'NAME': 'somedbname',
|
||||
'USER': 'someuser',
|
||||
'PASSWORD': 'somepassword',
|
||||
'HOST': 'somehost',
|
||||
'PORT': 444,
|
||||
'OPTIONS': {'charset': 'utf8'},
|
||||
}),
|
||||
self.settings_to_cmd_args_env(
|
||||
{
|
||||
"NAME": "somedbname",
|
||||
"USER": "someuser",
|
||||
"PASSWORD": "somepassword",
|
||||
"HOST": "somehost",
|
||||
"PORT": 444,
|
||||
"OPTIONS": {"charset": "utf8"},
|
||||
}
|
||||
),
|
||||
(expected_args, expected_env),
|
||||
)
|
||||
|
||||
def test_can_connect_using_sockets(self):
|
||||
expected_args = [
|
||||
'mysql',
|
||||
'--user=someuser',
|
||||
'--socket=/path/to/mysql.socket.file',
|
||||
'somedbname',
|
||||
"mysql",
|
||||
"--user=someuser",
|
||||
"--socket=/path/to/mysql.socket.file",
|
||||
"somedbname",
|
||||
]
|
||||
expected_env = {'MYSQL_PWD': 'somepassword'}
|
||||
expected_env = {"MYSQL_PWD": "somepassword"}
|
||||
self.assertEqual(
|
||||
self.settings_to_cmd_args_env({
|
||||
'NAME': 'somedbname',
|
||||
'USER': 'someuser',
|
||||
'PASSWORD': 'somepassword',
|
||||
'HOST': '/path/to/mysql.socket.file',
|
||||
'PORT': None,
|
||||
'OPTIONS': {},
|
||||
}),
|
||||
self.settings_to_cmd_args_env(
|
||||
{
|
||||
"NAME": "somedbname",
|
||||
"USER": "someuser",
|
||||
"PASSWORD": "somepassword",
|
||||
"HOST": "/path/to/mysql.socket.file",
|
||||
"PORT": None,
|
||||
"OPTIONS": {},
|
||||
}
|
||||
),
|
||||
(expected_args, expected_env),
|
||||
)
|
||||
|
||||
def test_ssl_certificate_is_added(self):
|
||||
expected_args = [
|
||||
'mysql',
|
||||
'--user=someuser',
|
||||
'--host=somehost',
|
||||
'--port=444',
|
||||
'--ssl-ca=sslca',
|
||||
'--ssl-cert=sslcert',
|
||||
'--ssl-key=sslkey',
|
||||
'somedbname',
|
||||
"mysql",
|
||||
"--user=someuser",
|
||||
"--host=somehost",
|
||||
"--port=444",
|
||||
"--ssl-ca=sslca",
|
||||
"--ssl-cert=sslcert",
|
||||
"--ssl-key=sslkey",
|
||||
"somedbname",
|
||||
]
|
||||
expected_env = {'MYSQL_PWD': 'somepassword'}
|
||||
expected_env = {"MYSQL_PWD": "somepassword"}
|
||||
self.assertEqual(
|
||||
self.settings_to_cmd_args_env({
|
||||
'NAME': 'somedbname',
|
||||
'USER': 'someuser',
|
||||
'PASSWORD': 'somepassword',
|
||||
'HOST': 'somehost',
|
||||
'PORT': 444,
|
||||
'OPTIONS': {
|
||||
'ssl': {
|
||||
'ca': 'sslca',
|
||||
'cert': 'sslcert',
|
||||
'key': 'sslkey',
|
||||
self.settings_to_cmd_args_env(
|
||||
{
|
||||
"NAME": "somedbname",
|
||||
"USER": "someuser",
|
||||
"PASSWORD": "somepassword",
|
||||
"HOST": "somehost",
|
||||
"PORT": 444,
|
||||
"OPTIONS": {
|
||||
"ssl": {
|
||||
"ca": "sslca",
|
||||
"cert": "sslcert",
|
||||
"key": "sslkey",
|
||||
},
|
||||
},
|
||||
},
|
||||
}),
|
||||
}
|
||||
),
|
||||
(expected_args, expected_env),
|
||||
)
|
||||
|
||||
|
@ -173,16 +185,16 @@ class MySqlDbshellCommandTestCase(SimpleTestCase):
|
|||
self.assertEqual(
|
||||
self.settings_to_cmd_args_env(
|
||||
{
|
||||
'NAME': 'somedbname',
|
||||
'USER': None,
|
||||
'PASSWORD': None,
|
||||
'HOST': None,
|
||||
'PORT': None,
|
||||
'OPTIONS': {},
|
||||
"NAME": "somedbname",
|
||||
"USER": None,
|
||||
"PASSWORD": None,
|
||||
"HOST": None,
|
||||
"PORT": None,
|
||||
"OPTIONS": {},
|
||||
},
|
||||
['--help'],
|
||||
["--help"],
|
||||
),
|
||||
(['mysql', 'somedbname', '--help'], None),
|
||||
(["mysql", "somedbname", "--help"], None),
|
||||
)
|
||||
|
||||
def test_crash_password_does_not_leak(self):
|
||||
|
@ -190,19 +202,19 @@ class MySqlDbshellCommandTestCase(SimpleTestCase):
|
|||
# crash.
|
||||
args, env = DatabaseClient.settings_to_cmd_args_env(
|
||||
{
|
||||
'NAME': 'somedbname',
|
||||
'USER': 'someuser',
|
||||
'PASSWORD': 'somepassword',
|
||||
'HOST': 'somehost',
|
||||
'PORT': 444,
|
||||
'OPTIONS': {},
|
||||
"NAME": "somedbname",
|
||||
"USER": "someuser",
|
||||
"PASSWORD": "somepassword",
|
||||
"HOST": "somehost",
|
||||
"PORT": 444,
|
||||
"OPTIONS": {},
|
||||
},
|
||||
[],
|
||||
)
|
||||
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))
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue