Merge ~binli/plainbox-provider-checkbox/+git/plainbox-provider-checkbox:skip-xorg-in-wayland into plainbox-provider-checkbox:master

[Bin Li]

[Bin Li (binli)]

When in xwayland.

-------------[ Running job 29 / 30. Estimated time left: unknown ]--------------
--------------------[ Test that the X process is running. ]---------------------
ID: com.canonical.certification::graphics/xorg-process
Category: com.canonical.plainbox::graphics
... 8< -------------------------------------------------------------------------
------------------------------------------------------------------------- >8 ---
Outcome: job passed
-------------[ Running job 30 / 30. Estimated time left: unknown ]--------------
-----------------------------[ Test Xorg version ]------------------------------
ID: com.canonical.certification::graphics/xorg-version
Category: com.canonical.plainbox::graphics
... 8< -------------------------------------------------------------------------
------------------------------------------------------------------------- >8 ---
Outcome: job passed

[Bin Li (binli)]

After switch to xorg.

-------------[ Running job 29 / 30. Estimated time left: unknown ]--------------
--------------------[ Test that the X process is running. ]---------------------
ID: com.canonical.certification::graphics/xorg-process
Category: com.canonical.plainbox::graphics
... 8< -------------------------------------------------------------------------
8039 /usr/lib/xorg/Xorg vt2 -displayfd 3 -auth /run/user/1001/gdm/Xauthority -nolisten tcp -background none -noreset -keeptty -novtswitch -verbose 3
12082 bash -c # shellcheck disable=SC1091 if [[ $XDG_SESSION_TYPE == "x11" ]] then pgrep -a -f '/usr/lib/xorg/Xorg' fi
------------------------------------------------------------------------- >8 ---
Outcome: job passed
-------------[ Running job 30 / 30. Estimated time left: unknown ]--------------
-----------------------------[ Test Xorg version ]------------------------------
ID: com.canonical.certification::graphics/xorg-version
Category: com.canonical.plainbox::graphics
... 8< -------------------------------------------------------------------------
1.21.1.3
------------------------------------------------------------------------- >8 ---
Outcome: job passed

[Bin Li (binli)]

Pieq helped find the root cause of the dependency of sutton-cli, and removed it, so I will drop my MR.

https://code.launchpad.net/~pieq/plainbox-provider-checkbox/+git/plainbox-provider-checkbox/+merge/425267

review: Disapprove

Unmerged commits

d105c31... by Bin Li on 2022-06-22

Check the XDG_SESSION_TYPE before running the jobs. (LP: #1968842)

diff --git a/units/graphics/jobs.pxu b/units/graphics/jobs.pxu
index 8206f1a..97b0e59 100644
--- a/units/graphics/jobs.pxu
+++ b/units/graphics/jobs.pxu
@@ -23,7 +23,12 @@ id: graphics/xorg-process
 requires:
  package.name == 'xorg'
  package.name == 'procps'
-command: pgrep -a -f '/usr/lib/xorg/Xorg'
+command:
+ # shellcheck disable=SC1091
+ if [[ $XDG_SESSION_TYPE == "x11" ]]
+ then
+   pgrep -a -f '/usr/lib/xorg/Xorg'
+ fi
 estimated_duration: 0.100
 _description: Test that the X process is running.
 _summary: Test that the X process is running.
@@ -33,7 +38,12 @@ category_id: com.canonical.plainbox::graphics
 id: graphics/xorg-version
 requires: package.name == "x11-utils"
 depends: graphics/xorg-process
-command: set -o pipefail; xdpyinfo | grep "^X.Org version" | cut -d ':' -f 2 | tr -d ' '
+command:
+ # shellcheck disable=SC1091
+ if [[ $XDG_SESSION_TYPE == "x11" ]]
+ then
+   set -o pipefail; xdpyinfo | grep "^X.Org version" | cut -d ':' -f 2 | tr -d ' '
+ fi
 estimated_duration: 0.018
 _description: Test to output the Xorg version
 _summary: Test Xorg version
@@ -62,7 +72,12 @@ plugin: shell
 category_id: com.canonical.plainbox::graphics
 id: graphics/xorg-failsafe
 requires: package.name == 'xorg'
-command: ! test -e /var/log/Xorg.failsafe.log
+command:
+ # shellcheck disable=SC1091
+ if [[ $XDG_SESSION_TYPE == "x11" ]]
+ then
+   ! test -e /var/log/Xorg.failsafe.log
+ fi
 estimated_duration: 0.030
 _description: Test that the X is not running in failsafe mode.
 _summary: Test that X is not in failsafe mode.