fdo-mirrors/libei
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libinput/libei.git synced 2026-02-03 14:50:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reformat for ruff 0.9

Browse source 
New formatting rules, apparently.

Part-of: <https://gitlab.freedesktop.org/libinput/libei/-/merge_requests/325>
This commit is contained in:
Peter Hutterer 2025-02-03 13:17:34 +10:00
parent fb85496aa3
commit 76845ecdfe
2 changed files with 36 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
test/test_protocol.py
View file

@ -352,13 +352,13 @@ class Eis:
rc = self.process.returncode
if rc not in [0, -signal.SIGTERM]:
if rc == VALGRIND_EXITCODE:
assert (
rc != VALGRIND_EXITCODE
), "valgrind reported errors, see valgrind error messages"
assert rc != VALGRIND_EXITCODE, (
"valgrind reported errors, see valgrind error messages"
)
else:
assert (
rc == -signal.SIGTERM
), f"Process exited with {signal.Signals(-rc).name}"
assert rc == -signal.SIGTERM, (
f"Process exited with {signal.Signals(-rc).name}"
)
self.process = None # allow this to be called multiple times
@classmethod
@ -460,7 +460,9 @@ class TestEiProtocol:
invalid_type = 4
try:
EiHandshake.EiContextType(invalid_type)
assert False, f"{invalid_type} should not be a valid ContextType, this test needs an update"
assert False, (
f"{invalid_type} should not be a valid ContextType, this test needs an update"
)
except ValueError:
pass
@ -911,9 +913,9 @@ class TestEiProtocol:
ei.wait_for(lambda: status.connected)
if missing_interface in [InterfaceName.EI_DEVICE, InterfaceName.EI_SEAT]:
assert ei.wait_for(lambda: status.disconnected)
assert (
status.disconnected
), f"Expected to be disconnected for missing {missing_interface}"
assert status.disconnected, (
f"Expected to be disconnected for missing {missing_interface}"
)
else:
assert (
missing_interface == InterfaceName.EI_POINTER
@ -984,9 +986,9 @@ class TestEiProtocol:
ei.wait_for(lambda: status.disconnected)
assert status.disconnected
assert (
status.reason == EiConnection.EiDisconnectReason.PROTOCOL
), status.explanation
assert status.reason == EiConnection.EiDisconnectReason.PROTOCOL, (
status.explanation
)
assert status.explanation is not None
def test_invalid_callback_version(self, eis):
@ -1022,9 +1024,9 @@ class TestEiProtocol:
ei.wait_for(lambda: status.disconnected)
assert status.disconnected
assert (
status.reason == EiConnection.EiDisconnectReason.PROTOCOL
), status.explanation
assert status.reason == EiConnection.EiDisconnectReason.PROTOCOL, (
status.explanation
)
assert status.explanation is not None
@pytest.mark.parametrize(

36
test/test_scanner.py
View file

@ -74,30 +74,30 @@ class TestScanner:
if f"{interface.plainname}.{message.name}" not in [
"connection.sync",
]:
assert (
arg.version_arg is not None
), f"{interface.name}.{message.name}::{arg.name}"
assert (
arg.version_arg.name == "version"
), f"{interface.name}.{message.name}::{arg.name}"
assert arg.version_arg is not None, (
f"{interface.name}.{message.name}::{arg.name}"
)
assert arg.version_arg.name == "version", (
f"{interface.name}.{message.name}::{arg.name}"
)
elif arg.name == "version":
if f"{interface.plainname}.{message.name}" not in [
"handshake.handshake_version",
"handshake.interface_version",
]:
assert (
arg.version_arg_for is not None
), f"{interface.name}.{message.name}::{arg.name}"
assert (
arg.version_arg_for.name != "version"
), f"{interface.name}.{message.name}::{arg.name}"
assert arg.version_arg_for is not None, (
f"{interface.name}.{message.name}::{arg.name}"
)
assert arg.version_arg_for.name != "version", (
f"{interface.name}.{message.name}::{arg.name}"
)
else:
assert (
arg.version_arg is None
), f"{interface.name}.{message.name}::{arg.name}"
assert (
arg.version_arg_for is None
), f"{interface.name}.{message.name}::{arg.name}"
assert arg.version_arg is None, (
f"{interface.name}.{message.name}::{arg.name}"
)
assert arg.version_arg_for is None, (
f"{interface.name}.{message.name}::{arg.name}"
)
@pytest.mark.parametrize("method", ("yamlfile", "jsonfile", "string"))
def test_cli_extra_data(self, tmp_path, method):