summaryrefslogtreecommitdiff
path: root/units/graphics
diff options
Diffstat (limited to 'units/graphics')
-rw-r--r--units/graphics/jobs.pxu23
1 files changed, 12 insertions, 11 deletions
diff --git a/units/graphics/jobs.pxu b/units/graphics/jobs.pxu
index b83964d..154f036 100644
--- a/units/graphics/jobs.pxu
+++ b/units/graphics/jobs.pxu
@@ -14,8 +14,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
@@ -43,17 +55,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