Merge ~pwlars/plainbox-provider-checkbox:xorg-needs-xorg into plainbox-provider-checkbox:master

[Paul Larson]

I was trying to run a test plan on bionic server images and hit a test fail for xorg-version, which was a little surprising. Something along the way depended on x11-utils, which was enough to make it try to run, but in order to get anything from xdpyinfo, xorg needs to be installed and actually even running. Depending on xorg-process should take care of that

[Maciej Kisielewski (kissiel)]

Makes total sense. +1

review: Approve

[Jonathan Cave (jocave)]

+1

review: Approve

diff --git a/units/graphics/jobs.pxu b/units/graphics/jobs.pxu
index fba1f7e..adc3628 100644
--- a/units/graphics/jobs.pxu
+++ b/units/graphics/jobs.pxu
@@ -13,8 +13,20 @@ _summary: Test X driver/version for {vendor} {product}
 
 plugin: shell
 category_id: com.canonical.plainbox::graphics
+id: graphics/xorg-process
+requires:
+ package.name == 'xorg'
+ package.name == 'procps'
+command: pgrep -a -f '/usr/lib/xorg/Xorg'
+estimated_duration: 0.100
+_description: Test that the X process is running.
+_summary: Test that the X process is running.
+
+plugin: shell
+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 ' '
 estimated_duration: 0.018
 _description: Test to output the Xorg version
@@ -42,17 +54,6 @@ _description:
 
 plugin: shell
 category_id: com.canonical.plainbox::graphics
-id: graphics/xorg-process
-requires:
- package.name == 'xorg'
- package.name == 'procps'
-command: pgrep -a -f '/usr/lib/xorg/Xorg'
-estimated_duration: 0.100
-_description: Test that the X process is running.
-_summary: Test that the X process is running.
-
-plugin: shell
-category_id: com.canonical.plainbox::graphics
 id: graphics/xorg-failsafe
 requires: package.name == 'xorg'
 command: ! test -e /var/log/Xorg.failsafe.log