Format python files with black

And set up a gitlab ci job to check that
This commit is contained in:
Peter Hutterer 2023-02-01 11:36:17 +10:00
parent 857735fe7f
commit 642e258ecb
4 changed files with 42 additions and 15 deletions

View file

@ -130,6 +130,16 @@ check-merge-request:
junit: results.xml
allow_failure: true
# Format anything python with python-black
#
python-black:
image: golang:alpine
stage: prep
before_script:
- apk add python3 py-pip black
script:
- black --check --diff .
#
# Build distribution-specific images used by the jobs in the build stage
#

View file

@ -138,6 +138,16 @@ check-merge-request:
junit: results.xml
allow_failure: true
# Format anything python with python-black
#
python-black:
image: golang:alpine
stage: prep
before_script:
- apk add python3 py-pip black
script:
- black --check --diff .
#
# Build distribution-specific images used by the jobs in the build stage
#

View file

@ -104,16 +104,18 @@ def SelectDevices(self, session_handle, options, sender):
try:
session = params.sessions[session_handle]
if session.state != RDSession.State.CREATED:
raise dbus.exceptions.DBusException(f"Session in state {session.state}, expected CREATED",
name="org.freedesktop.DBus.Error.AccessDenied")
raise dbus.exceptions.DBusException(
f"Session in state {session.state}, expected CREATED",
name="org.freedesktop.DBus.Error.AccessDenied",
)
else:
resp = params.response
if resp == 0:
session.advance_state()
except KeyError:
raise dbus.exceptions.DBusException(
"Invalid session",
name="org.freedesktop.DBus.Error.AccessDenied")
"Invalid session", name="org.freedesktop.DBus.Error.AccessDenied"
)
response = Response(resp, {})
request.respond(response, delay=params.delay)
@ -122,7 +124,7 @@ def SelectDevices(self, session_handle, options, sender):
except Exception as e:
logger.critical(e)
if isinstance(e, dbus.exceptions.DBusException):
raise e
raise e
@dbus.service.method(
@ -144,16 +146,18 @@ def Start(self, session_handle, parent_window, options, sender):
try:
session = params.sessions[session_handle]
if session.state != RDSession.State.SELECTED:
raise dbus.exceptions.DBusException(f"Session in state {session.state}, expected SELECTED",
name="org.freedesktop.DBus.Error.AccessDenied")
raise dbus.exceptions.DBusException(
f"Session in state {session.state}, expected SELECTED",
name="org.freedesktop.DBus.Error.AccessDenied",
)
else:
resp = params.response
if resp == 0:
session.advance_state()
except KeyError:
raise dbus.exceptions.DBusException(
"Invalid session",
name="org.freedesktop.DBus.Error.AccessDenied")
"Invalid session", name="org.freedesktop.DBus.Error.AccessDenied"
)
response = Response(resp, results)
request.respond(response, delay=params.delay)
@ -162,7 +166,7 @@ def Start(self, session_handle, parent_window, options, sender):
except Exception as e:
logger.critical(e)
if isinstance(e, dbus.exceptions.DBusException):
raise e
raise e
@dbus.service.method(
@ -313,12 +317,14 @@ def ConnectToEIS(self, session_handle, options):
session = params.sessions[session_handle]
if session.state != RDSession.State.STARTED:
logger.error(f"Session in state {session.state}, expected STARTED")
raise dbus.exceptions.DBusException("Session must be started before ConnectToEIS",
name="org.freedesktop.DBus.Error.AccesDenied")
raise dbus.exceptions.DBusException(
"Session must be started before ConnectToEIS",
name="org.freedesktop.DBus.Error.AccesDenied",
)
except KeyError:
raise dbus.exceptions.DBusException(
"Invalid session",
name="org.freedesktop.DBus.Error.AccessDenied")
"Invalid session", name="org.freedesktop.DBus.Error.AccessDenied"
)
import socket
@ -333,4 +339,4 @@ def ConnectToEIS(self, session_handle, options):
except Exception as e:
logger.critical(e)
if isinstance(e, dbus.exceptions.DBusException):
raise e
raise e

View file

@ -290,6 +290,7 @@ class TestOeffis(dbusmock.DBusTestCase):
"""
Test class that sets up a mocked DBus session bus to be used by liboeffis.so.
"""
@classmethod
def setUpClass(cls):
cls.PORTAL_NAME = "RemoteDesktop"