almet/dangerzone
1
0
Fork 0
mirror of https://github.com/freedomofpress/dangerzone.git synced 2025-04-28 18:02:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Apply ruff fixes

Browse source
This commit is contained in:
Alexis Métaireau 2025-01-06 15:51:54 +01:00
parent 20f1e43471
commit 77fe6fb4aa
No known key found for this signature in database
GPG key ID: C65C7A89A8FFC56E
2 changed files with 37 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
dangerzone/conversion/common.py
View file

@ -9,7 +9,6 @@ INT_BYTES = 2
class CommandError(RuntimeError): class CommandError(RuntimeError):
def __init__(self, msg, stdout, stderr): def __init__(self, msg, stdout, stderr):
self.stdout = stdout self.stdout = stdout
self.stderr = stderr self.stderr = stderr

67
tests/gui/test_logic.py
View file

@ -33,17 +33,19 @@ def test_order_mime_handers() -> None:
"LibreOffice", "LibreOffice",
] ]
with mock.patch( with (
"subprocess.check_output", return_value=b"libreoffice-draw.desktop" mock.patch(
) as mock_default_mime_hander, mock.patch( "subprocess.check_output", return_value=b"libreoffice-draw.desktop"
"os.listdir", ) as mock_default_mime_hander,
side_effect=[ mock.patch(
["org.gnome.Evince.desktop"], "os.listdir",
["org.pwmt.zathura-pdf-mupdf.desktop"], side_effect=[
["libreoffice-draw.desktop"], ["org.gnome.Evince.desktop"],
], ["org.pwmt.zathura-pdf-mupdf.desktop"],
) as mock_list, mock.patch( ["libreoffice-draw.desktop"],
"dangerzone.gui.logic.DesktopEntry", return_value=mock_desktop ],
) as mock_list,
mock.patch("dangerzone.gui.logic.DesktopEntry", return_value=mock_desktop),
): ):
dz = DangerzoneGui(mock_app, dummy) dz = DangerzoneGui(mock_app, dummy)
@ -77,18 +79,20 @@ def test_mime_handers_succeeds_no_default_found() -> None:
"LibreOffice", "LibreOffice",
] ]
with mock.patch( with (
"subprocess.check_output", mock.patch(
side_effect=subprocess.CalledProcessError(1, "Oh no, xdg-mime error!)"), "subprocess.check_output",
) as mock_default_mime_hander, mock.patch( side_effect=subprocess.CalledProcessError(1, "Oh no, xdg-mime error!)"),
"os.listdir", ) as mock_default_mime_hander,
side_effect=[ mock.patch(
["org.gnome.Evince.desktop"], "os.listdir",
["org.pwmt.zathura-pdf-mupdf.desktop"], side_effect=[
["libreoffice-draw.desktop"], ["org.gnome.Evince.desktop"],
], ["org.pwmt.zathura-pdf-mupdf.desktop"],
) as mock_list, mock.patch( ["libreoffice-draw.desktop"],
"dangerzone.gui.logic.DesktopEntry", return_value=mock_desktop ],
) as mock_list,
mock.patch("dangerzone.gui.logic.DesktopEntry", return_value=mock_desktop),
): ):
dz = DangerzoneGui(mock_app, dummy) dz = DangerzoneGui(mock_app, dummy)
@ -109,13 +113,16 @@ def test_malformed_desktop_entry_is_catched() -> None:
mock_app = mock.MagicMock() mock_app = mock.MagicMock()
dummy = mock.MagicMock() dummy = mock.MagicMock()
with mock.patch("dangerzone.gui.logic.DesktopEntry") as mock_desktop, mock.patch( with (
"os.listdir", mock.patch("dangerzone.gui.logic.DesktopEntry") as mock_desktop,
side_effect=[ mock.patch(
["malformed.desktop", "another.desktop"], "os.listdir",
[], side_effect=[
[], ["malformed.desktop", "another.desktop"],
], [],
[],
],
),
): ):
mock_desktop.side_effect = ParsingError("Oh noes!", "malformed.desktop") mock_desktop.side_effect = ParsingError("Oh noes!", "malformed.desktop")
DangerzoneGui(mock_app, dummy) DangerzoneGui(mock_app, dummy)