Merge #419273 from ~sylvain-pineau/plainbox-provider-checkbox:fix-1968641

4 files changed, 19 insertions, 24 deletions

diff --git a/units/graphics/jobs.pxu b/units/graphics/jobs.pxu
index d67af9e..185193b 100644
--- a/units/graphics/jobs.pxu
+++ b/units/graphics/jobs.pxu
@@ -7,7 +7,12 @@ id: graphics/{index}_driver_version_{product_slug}
 command:
 # shellcheck disable=SC1091
 source graphics_env.sh {driver} {index}
- graphics_driver.py
+ if [[ $XDG_SESSION_TYPE == "wayland" ]]
+ then
+ inxi_snapshot -Gazy
+ else
+ graphics_driver.py
+ fi
 estimated_duration: 0.5
 _description: Parses Xorg.0.log and discovers the running X driver and version for the {vendor} {product} graphics card
 _summary: Test X driver/version for {vendor} {product}
diff --git a/units/graphics/legacy.pxu b/units/graphics/legacy.pxu
index c2f2b53..14969b0 100644
--- a/units/graphics/legacy.pxu
+++ b/units/graphics/legacy.pxu
@@ -1,7 +1,13 @@
 plugin: shell
 category_id: com.canonical.plainbox::graphics
 id: graphics/driver_version
-command: graphics_driver.py
+command:
+ if [[ $XDG_SESSION_TYPE == "wayland" ]]
+ then
+ inxi_snapshot -Gazy
+ else
+ graphics_driver.py
+ fi
 estimated_duration: 0.500
 _description: Parses Xorg.0.Log and discovers the running X driver and version
 _summary: Test X driver/version
diff --git a/units/suspend/suspend-graphics.pxu b/units/suspend/suspend-graphics.pxu
index 22012ec..4095273 100644
--- a/units/suspend/suspend-graphics.pxu
+++ b/units/suspend/suspend-graphics.pxu
@@ -208,6 +208,12 @@ command:
 # shellcheck disable=SC1091
 source graphics_env.sh {{ driver }} {{ index }}
 graphics_driver.py
+ if [[ $XDG_SESSION_TYPE == "wayland" ]]
+ then
+ inxi_snapshot -Gazy
+ else
+ graphics_driver.py
+ fi
 estimated_duration: 0.500
 _description: Parses Xorg.0.Log and discovers the running X driver and version after suspend for the {{ vendor }} {{ product }} graphics card
 _summary: Test X driver/version after suspend for {{ vendor }} {{ product }}
diff --git a/units/suspend/suspend.pxu b/units/suspend/suspend.pxu
index 73a56dc..8f504fc 100644
--- a/units/suspend/suspend.pxu
+++ b/units/suspend/suspend.pxu
@@ -2247,28 +2247,6 @@ _description:
 VERIFICATION:
 Do you see color bars and static?
 
-unit: template
-template-resource: graphics_card
-template-filter: graphics_card.prime_gpu_offload == 'Off'
-plugin: shell
-category_id: com.canonical.plainbox::suspend
-id: suspend/{index}_driver_version_after_suspend_{product_slug}
-depends: suspend/{index}_suspend_after_switch_to_card_{product_slug}
-command: graphics_driver
-estimated_duration: 0.500
-_description: Parses Xorg.0.Log and discovers the running X driver and version after suspend for the {vendor} {product} graphics card
-_summary: Test X driver/version after suspend for {vendor} {product}
-
-id: suspend/driver_version_after_suspend
-requires: device.category == 'VIDEO'
-depends: suspend/suspend_advanced_auto
-plugin: shell
-category_id: com.canonical.plainbox::suspend
-command: graphics_driver
-estimated_duration: 0.500
-_description: Parses Xorg.0.Log and discovers the running X driver and version after suspend
-_summary: Test X driver/version after suspend
-
 id: suspend/oops_after_suspend
 depends: suspend/suspend_advanced_auto
 plugin:shell