From cb15143dfbb6ccb1421a205c65c4930d646290fa Mon Sep 17 00:00:00 2001 From: Paolo Gentili Date: Tue, 19 Nov 2024 11:02:22 +0100 Subject: [PATCH] Change: moved desktop_session to resource provider --- providers/base/units/desktop/resource.pxu | 6 ------ .../bin/desktop_session_resource.py} | 0 providers/resource/jobs/resource.pxu | 6 ++++++ .../tests/test_desktop_session_resource.py} | 14 +++++++------- 4 files changed, 13 insertions(+), 13 deletions(-) delete mode 100644 providers/base/units/desktop/resource.pxu rename providers/{base/bin/desktop_session.py => resource/bin/desktop_session_resource.py} (100%) rename providers/{base/tests/test_desktop_session.py => resource/tests/test_desktop_session_resource.py} (77%) diff --git a/providers/base/units/desktop/resource.pxu b/providers/base/units/desktop/resource.pxu deleted file mode 100644 index f89d70155e..0000000000 --- a/providers/base/units/desktop/resource.pxu +++ /dev/null @@ -1,6 +0,0 @@ -id: desktop_session -plugin: resource -category_id: com.canonical.plainbox::info -_summary: Check whether a desktop session is available and of which type. -environ: XDG_SESSION_TYPE XDG_CURRENT_DESKTOP -command: desktop_session.py resources diff --git a/providers/base/bin/desktop_session.py b/providers/resource/bin/desktop_session_resource.py similarity index 100% rename from providers/base/bin/desktop_session.py rename to providers/resource/bin/desktop_session_resource.py diff --git a/providers/resource/jobs/resource.pxu b/providers/resource/jobs/resource.pxu index 2bae08bd4f..24d72a683d 100644 --- a/providers/resource/jobs/resource.pxu +++ b/providers/resource/jobs/resource.pxu @@ -532,3 +532,9 @@ plugin: resource _summary: Discover if the system supports power modes via acpi _description: Discover resource info from /sys/firmware/apci command: platform_profile_resource.py + +id: desktop_session +plugin: resource +_summary: Check whether a desktop session is available and of which type. +environ: XDG_SESSION_TYPE XDG_CURRENT_DESKTOP +command: desktop_session_resource.py resources \ No newline at end of file diff --git a/providers/base/tests/test_desktop_session.py b/providers/resource/tests/test_desktop_session_resource.py similarity index 77% rename from providers/base/tests/test_desktop_session.py rename to providers/resource/tests/test_desktop_session_resource.py index dd396f296f..ea98abc74a 100644 --- a/providers/base/tests/test_desktop_session.py +++ b/providers/resource/tests/test_desktop_session_resource.py @@ -1,22 +1,22 @@ -"""This module provides test cases for the desktop_session module.""" +"""This module provides test cases for the desktop_session_resource module.""" import os import unittest from unittest.mock import call, patch -import desktop_session +import desktop_session_resource class DesktopSessionTests(unittest.TestCase): - """Tests for the desktop_session module.""" + """Tests for the desktop_session_resource module.""" - @patch("desktop_session.resources") + @patch("desktop_session_resource.resources") def test_main(self, mock_resources): """ Test whether the main function calls the resources function when requested via CLI. """ - desktop_session.main(["resources"]) + desktop_session_resource.main(["resources"]) mock_resources.assert_called_once_with() @patch("builtins.print") @@ -27,7 +27,7 @@ def test_resources_server(self, mock_print): "XDG_SESSION_TYPE": "tty", } with patch.dict(os.environ, server_session, clear=True): - desktop_session.resources() + desktop_session_resource.resources() mock_print.assert_has_calls( [ @@ -45,7 +45,7 @@ def test_resources_desktop(self, mock_print): "XDG_CURRENT_DESKTOP": "hyprland", } with patch.dict(os.environ, server_session, clear=True): - desktop_session.resources() + desktop_session_resource.resources() mock_print.assert_has_calls( [