diff options
| author | Paul Larson <paul.larson@canonical.com> | 2020-07-15 12:24:46 -0500 |
|---|---|---|
| committer | Paul Larson <paul.larson@canonical.com> | 2020-07-15 12:24:46 -0500 |
| commit | 8a495c0055de4f7423fae03d828f6440c641b822 (patch) | |
| tree | fcc8d8745f208f51c2403f318acf5ea12a11c6d0 | |
| parent | f210ce4d8305dc63cc9270be536eb90e255638ba (diff) | |
make xorg-version depend on xorg-process
| -rw-r--r-- | units/graphics/jobs.pxu | 23 |
1 files changed, 12 insertions, 11 deletions
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 |