From 8a495c0055de4f7423fae03d828f6440c641b822 Mon Sep 17 00:00:00 2001 From: Paul Larson Date: Wed, 15 Jul 2020 12:24:46 -0500 Subject: make xorg-version depend on xorg-process --- units/graphics/jobs.pxu | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'units/graphics') 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 @@ -11,10 +11,22 @@ 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} +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 @@ -40,17 +52,6 @@ _description: VERIFICATION: Did the resolution on the {vendor} {product} graphics card change as expected? -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 -- cgit v1.2.3