YunoHost/moulinette
1
0
Fork 0
mirror of https://github.com/YunoHost/moulinette.git synced 2024-09-03 20:06:31 +02:00
Code Issues Projects Releases Packages Wiki Activity

test_filesystem: try to sort out bytes vs str

Browse source
This commit is contained in:
Augustin Trancart 2020-04-18 15:24:55 +02:00
parent c4289f2d47
commit 71360130e6
2 changed files with 15 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
test/conftest.py
View file

@ -179,7 +179,7 @@ def test_json(tmp_path):
@pytest.fixture @pytest.fixture
def test_yaml(tmp_path): def test_yaml(tmp_path):
test_yaml = yaml.dump({"foo": "bar"}) test_yaml = yaml.dump({"foo": "bar"}, encoding='utf-8')
test_file = tmp_path / "test.txt" test_file = tmp_path / "test.txt"
test_file.write_bytes(test_yaml) test_file.write_bytes(test_yaml)
return test_file return test_file
@ -189,7 +189,7 @@ def test_yaml(tmp_path):
def test_toml(tmp_path): def test_toml(tmp_path):
test_toml = toml.dumps({"foo": "bar"}) test_toml = toml.dumps({"foo": "bar"})
test_file = tmp_path / "test.txt" test_file = tmp_path / "test.txt"
test_file.write_bytes(str(test_toml)) test_file.write_bytes(test_toml.encode('utf-8'))
return test_file return test_file
@ -198,14 +198,14 @@ def test_ldif(tmp_path):
test_file = tmp_path / "test.txt" test_file = tmp_path / "test.txt"
from ldif import LDIFWriter from ldif import LDIFWriter
writer = LDIFWriter(open(str(test_file), "wb")) writer = LDIFWriter(open(str(test_file), "w"))
writer.unparse( writer.unparse(
"mail=alice@example.com", "mail=alice@example.com",
{ {
"cn": ["Alice Alison"], "cn": [b"Alice Alison"],
"mail": ["alice@example.com"], "mail": [b"alice@example.com"],
"objectclass": ["top", "person"], "objectclass": [b"top", b"person"],
}, },
) )

20
test/test_filesystem.py
View file

@ -121,16 +121,16 @@ def test_read_ldif(test_ldif):
dn, entry = read_ldif(str(test_ldif))[0] dn, entry = read_ldif(str(test_ldif))[0]
assert dn == "mail=alice@example.com" assert dn == "mail=alice@example.com"
assert entry["mail"] == ["alice@example.com"] assert entry["mail"] == [b"alice@example.com"]
assert entry["objectclass"] == ["top", "person"] assert entry["objectclass"] == [b"top", b"person"]
assert entry["cn"] == ["Alice Alison"] assert entry["cn"] == [b"Alice Alison"]
dn, entry = read_ldif(str(test_ldif), ["objectclass"])[0] dn, entry = read_ldif(str(test_ldif), ["objectclass"])[0]
assert dn == "mail=alice@example.com" assert dn == "mail=alice@example.com"
assert entry["mail"] == ["alice@example.com"] assert entry["mail"] == [b"alice@example.com"]
assert "objectclass" not in entry assert "objectclass" not in entry
assert entry["cn"] == ["Alice Alison"] assert entry["cn"] == [b"Alice Alison"]
def test_read_ldif_cannot_ioerror(test_ldif, mocker): def test_read_ldif_cannot_ioerror(test_ldif, mocker):
@ -465,10 +465,9 @@ def test_chown_exception(test_file, mocker):
chown(str(test_file), 1) chown(str(test_file), 1)
translation = m18n.g( translation = m18n.g(
"error_changing_file_permissions", path=test_file, error=str(error) "error_changing_file_permissions", path=str(test_file), error=str(error)
) )
expected_msg = translation.format(path=test_file, error=str(error)) assert translation in str(exception)
assert expected_msg in str(exception)
def test_chmod(test_file): def test_chmod(test_file):
@ -504,10 +503,9 @@ def test_chmod_exception(test_file, mocker):
chmod(str(test_file), 0o000) chmod(str(test_file), 0o000)
translation = m18n.g( translation = m18n.g(
"error_changing_file_permissions", path=test_file, error=str(error) "error_changing_file_permissions", path=str(test_file), error=str(error)
) )
expected_msg = translation.format(path=test_file, error=str(error)) assert translation in str(exception)
assert expected_msg in str(exception)
def test_remove_file(test_file): def test_remove_file(test_file):