Merging upstream version 1.29.2.
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
3180ec4213
commit
f15fe4f59f
GPG key ID:
FBB4F0E80A80222F
68 changed files with 3723 additions and 3336 deletions
|
|
@ -1,4 +1,5 @@
|
|||
"""Unit tests for the mycli.config module."""
|
||||
|
||||
from io import BytesIO, StringIO, TextIOWrapper
|
||||
import os
|
||||
import struct
|
||||
|
|
@ -6,21 +7,26 @@ import sys
|
|||
import tempfile
|
||||
import pytest
|
||||
|
||||
from mycli.config import (get_mylogin_cnf_path, open_mylogin_cnf,
|
||||
read_and_decrypt_mylogin_cnf, read_config_file,
|
||||
str_to_bool, strip_matching_quotes)
|
||||
from mycli.config import (
|
||||
get_mylogin_cnf_path,
|
||||
open_mylogin_cnf,
|
||||
read_and_decrypt_mylogin_cnf,
|
||||
read_config_file,
|
||||
str_to_bool,
|
||||
strip_matching_quotes,
|
||||
)
|
||||
|
||||
LOGIN_PATH_FILE = os.path.abspath(os.path.join(os.path.dirname(__file__),
|
||||
'mylogin.cnf'))
|
||||
LOGIN_PATH_FILE = os.path.abspath(os.path.join(os.path.dirname(__file__), "mylogin.cnf"))
|
||||
|
||||
|
||||
def open_bmylogin_cnf(name):
|
||||
"""Open contents of *name* in a BytesIO buffer."""
|
||||
with open(name, 'rb') as f:
|
||||
with open(name, "rb") as f:
|
||||
buf = BytesIO()
|
||||
buf.write(f.read())
|
||||
return buf
|
||||
|
||||
|
||||
def test_read_mylogin_cnf():
|
||||
"""Tests that a login path file can be read and decrypted."""
|
||||
mylogin_cnf = open_mylogin_cnf(LOGIN_PATH_FILE)
|
||||
|
|
@ -28,7 +34,7 @@ def test_read_mylogin_cnf():
|
|||
assert isinstance(mylogin_cnf, TextIOWrapper)
|
||||
|
||||
contents = mylogin_cnf.read()
|
||||
for word in ('[test]', 'user', 'password', 'host', 'port'):
|
||||
for word in ("[test]", "user", "password", "host", "port"):
|
||||
assert word in contents
|
||||
|
||||
|
||||
|
|
@ -46,7 +52,7 @@ def test_corrupted_login_key():
|
|||
buf.seek(4)
|
||||
|
||||
# Write null bytes over half the login key
|
||||
buf.write(b'\0\0\0\0\0\0\0\0\0\0')
|
||||
buf.write(b"\0\0\0\0\0\0\0\0\0\0")
|
||||
|
||||
buf.seek(0)
|
||||
mylogin_cnf = read_and_decrypt_mylogin_cnf(buf)
|
||||
|
|
@ -63,58 +69,58 @@ def test_corrupted_pad():
|
|||
|
||||
# Skip option group
|
||||
len_buf = buf.read(4)
|
||||
cipher_len, = struct.unpack("<i", len_buf)
|
||||
(cipher_len,) = struct.unpack("<i", len_buf)
|
||||
buf.read(cipher_len)
|
||||
|
||||
# Corrupt the pad for the user line
|
||||
len_buf = buf.read(4)
|
||||
cipher_len, = struct.unpack("<i", len_buf)
|
||||
(cipher_len,) = struct.unpack("<i", len_buf)
|
||||
buf.read(cipher_len - 1)
|
||||
buf.write(b'\0')
|
||||
buf.write(b"\0")
|
||||
|
||||
buf.seek(0)
|
||||
mylogin_cnf = TextIOWrapper(read_and_decrypt_mylogin_cnf(buf))
|
||||
contents = mylogin_cnf.read()
|
||||
for word in ('[test]', 'password', 'host', 'port'):
|
||||
for word in ("[test]", "password", "host", "port"):
|
||||
assert word in contents
|
||||
assert 'user' not in contents
|
||||
assert "user" not in contents
|
||||
|
||||
|
||||
def test_get_mylogin_cnf_path():
|
||||
"""Tests that the path for .mylogin.cnf is detected."""
|
||||
original_env = None
|
||||
if 'MYSQL_TEST_LOGIN_FILE' in os.environ:
|
||||
original_env = os.environ.pop('MYSQL_TEST_LOGIN_FILE')
|
||||
is_windows = sys.platform == 'win32'
|
||||
if "MYSQL_TEST_LOGIN_FILE" in os.environ:
|
||||
original_env = os.environ.pop("MYSQL_TEST_LOGIN_FILE")
|
||||
is_windows = sys.platform == "win32"
|
||||
|
||||
login_cnf_path = get_mylogin_cnf_path()
|
||||
|
||||
if original_env is not None:
|
||||
os.environ['MYSQL_TEST_LOGIN_FILE'] = original_env
|
||||
os.environ["MYSQL_TEST_LOGIN_FILE"] = original_env
|
||||
|
||||
if login_cnf_path is not None:
|
||||
assert login_cnf_path.endswith('.mylogin.cnf')
|
||||
assert login_cnf_path.endswith(".mylogin.cnf")
|
||||
|
||||
if is_windows is True:
|
||||
assert 'MySQL' in login_cnf_path
|
||||
assert "MySQL" in login_cnf_path
|
||||
else:
|
||||
home_dir = os.path.expanduser('~')
|
||||
home_dir = os.path.expanduser("~")
|
||||
assert login_cnf_path.startswith(home_dir)
|
||||
|
||||
|
||||
def test_alternate_get_mylogin_cnf_path():
|
||||
"""Tests that the alternate path for .mylogin.cnf is detected."""
|
||||
original_env = None
|
||||
if 'MYSQL_TEST_LOGIN_FILE' in os.environ:
|
||||
original_env = os.environ.pop('MYSQL_TEST_LOGIN_FILE')
|
||||
if "MYSQL_TEST_LOGIN_FILE" in os.environ:
|
||||
original_env = os.environ.pop("MYSQL_TEST_LOGIN_FILE")
|
||||
|
||||
_, temp_path = tempfile.mkstemp()
|
||||
os.environ['MYSQL_TEST_LOGIN_FILE'] = temp_path
|
||||
os.environ["MYSQL_TEST_LOGIN_FILE"] = temp_path
|
||||
|
||||
login_cnf_path = get_mylogin_cnf_path()
|
||||
|
||||
if original_env is not None:
|
||||
os.environ['MYSQL_TEST_LOGIN_FILE'] = original_env
|
||||
os.environ["MYSQL_TEST_LOGIN_FILE"] = original_env
|
||||
|
||||
assert temp_path == login_cnf_path
|
||||
|
||||
|
|
@ -124,17 +130,17 @@ def test_str_to_bool():
|
|||
|
||||
assert str_to_bool(False) is False
|
||||
assert str_to_bool(True) is True
|
||||
assert str_to_bool('False') is False
|
||||
assert str_to_bool('True') is True
|
||||
assert str_to_bool('TRUE') is True
|
||||
assert str_to_bool('1') is True
|
||||
assert str_to_bool('0') is False
|
||||
assert str_to_bool('on') is True
|
||||
assert str_to_bool('off') is False
|
||||
assert str_to_bool('off') is False
|
||||
assert str_to_bool("False") is False
|
||||
assert str_to_bool("True") is True
|
||||
assert str_to_bool("TRUE") is True
|
||||
assert str_to_bool("1") is True
|
||||
assert str_to_bool("0") is False
|
||||
assert str_to_bool("on") is True
|
||||
assert str_to_bool("off") is False
|
||||
assert str_to_bool("off") is False
|
||||
|
||||
with pytest.raises(ValueError):
|
||||
str_to_bool('foo')
|
||||
str_to_bool("foo")
|
||||
|
||||
with pytest.raises(TypeError):
|
||||
str_to_bool(None)
|
||||
|
|
@ -143,19 +149,19 @@ def test_str_to_bool():
|
|||
def test_read_config_file_list_values_default():
|
||||
"""Test that reading a config file uses list_values by default."""
|
||||
|
||||
f = StringIO(u"[main]\nweather='cloudy with a chance of meatballs'\n")
|
||||
f = StringIO("[main]\nweather='cloudy with a chance of meatballs'\n")
|
||||
config = read_config_file(f)
|
||||
|
||||
assert config['main']['weather'] == u"cloudy with a chance of meatballs"
|
||||
assert config["main"]["weather"] == "cloudy with a chance of meatballs"
|
||||
|
||||
|
||||
def test_read_config_file_list_values_off():
|
||||
"""Test that you can disable list_values when reading a config file."""
|
||||
|
||||
f = StringIO(u"[main]\nweather='cloudy with a chance of meatballs'\n")
|
||||
f = StringIO("[main]\nweather='cloudy with a chance of meatballs'\n")
|
||||
config = read_config_file(f, list_values=False)
|
||||
|
||||
assert config['main']['weather'] == u"'cloudy with a chance of meatballs'"
|
||||
assert config["main"]["weather"] == "'cloudy with a chance of meatballs'"
|
||||
|
||||
|
||||
def test_strip_quotes_with_matching_quotes():
|
||||
|
|
@ -177,7 +183,7 @@ def test_strip_quotes_with_unmatching_quotes():
|
|||
def test_strip_quotes_with_empty_string():
|
||||
"""Test that an empty string is handled during unquoting."""
|
||||
|
||||
assert '' == strip_matching_quotes('')
|
||||
assert "" == strip_matching_quotes("")
|
||||
|
||||
|
||||
def test_strip_quotes_with_none():
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue