Checkbox Provider - Base

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

  1. Git
  2. lp:~binli/plainbox-provider-checkbox/+git/plainbox-provider-checkbox
  3. skip-xorg-in-wayland
  4. Merge into master
Proposed by Bin Li
Status: Rejected
Rejected by: Sylvain Pineau
Proposed branch: ~binli/plainbox-provider-checkbox/+git/plainbox-provider-checkbox:skip-xorg-in-wayland
Merge into: plainbox-provider-checkbox:master
Diff against target: 46 lines (+18/-3)
1 file modified
units/graphics/jobs.pxu (+18/-3)
Reviewer Review Type Date Requested Status
Bin Li Disapprove
Sylvain Pineau Pending
Pierre Equoy Pending
Review via email: mp+425201@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Bin Li (binli) wrote :

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

Revision history for this message
Bin Li (binli) wrote :

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

Revision history for this message
Bin Li (binli) wrote :

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

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
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
23requires:23requires:
24 package.name == 'xorg'24 package.name == 'xorg'
25 package.name == 'procps'25 package.name == 'procps'
26command: pgrep -a -f '/usr/lib/xorg/Xorg'26command:
27 # shellcheck disable=SC1091
28 if [[ $XDG_SESSION_TYPE == "x11" ]]
29 then
30 pgrep -a -f '/usr/lib/xorg/Xorg'
31 fi
27estimated_duration: 0.10032estimated_duration: 0.100
28_description: Test that the X process is running.33_description: Test that the X process is running.
29_summary: Test that the X process is running.34_summary: Test that the X process is running.
@@ -33,7 +38,12 @@ category_id: com.canonical.plainbox::graphics
33id: graphics/xorg-version38id: graphics/xorg-version
34requires: package.name == "x11-utils"39requires: package.name == "x11-utils"
35depends: graphics/xorg-process40depends: graphics/xorg-process
36command: set -o pipefail; xdpyinfo | grep "^X.Org version" | cut -d ':' -f 2 | tr -d ' '41command:
42 # shellcheck disable=SC1091
43 if [[ $XDG_SESSION_TYPE == "x11" ]]
44 then
45 set -o pipefail; xdpyinfo | grep "^X.Org version" | cut -d ':' -f 2 | tr -d ' '
46 fi
37estimated_duration: 0.01847estimated_duration: 0.018
38_description: Test to output the Xorg version48_description: Test to output the Xorg version
39_summary: Test Xorg version49_summary: Test Xorg version
@@ -62,7 +72,12 @@ plugin: shell
62category_id: com.canonical.plainbox::graphics72category_id: com.canonical.plainbox::graphics
63id: graphics/xorg-failsafe73id: graphics/xorg-failsafe
64requires: package.name == 'xorg'74requires: package.name == 'xorg'
65command: ! test -e /var/log/Xorg.failsafe.log75command:
76 # shellcheck disable=SC1091
77 if [[ $XDG_SESSION_TYPE == "x11" ]]
78 then
79 ! test -e /var/log/Xorg.failsafe.log
80 fi
66estimated_duration: 0.03081estimated_duration: 0.030
67_description: Test that the X is not running in failsafe mode.82_description: Test that the X is not running in failsafe mode.
68_summary: Test that X is not in failsafe mode.83_summary: Test that X is not in failsafe mode.

Subscribers

People subscribed via source and target branches