diff options
| author | Jonathan Cave <jonathan.cave@canonical.com> | 2020-07-28 18:37:03 +0100 |
|---|---|---|
| committer | Jonathan Cave <jonathan.cave@canonical.com> | 2020-07-30 14:20:05 +0100 |
| commit | d860c0e4b7795c4f1fc9dff2c129434b8e8276f9 (patch) | |
| tree | 753550d8e7b1cf2c0bb87c482d94502b952df238 /units/graphics | |
| parent | 6a157f7a7ec302fb4cb4cc186ecb74c263f5a571 (diff) | |
units/*: remove use of zenity dialogs
Modify any jobs still using zenity dialogs to only display the information on the command line
Diffstat (limited to 'units/graphics')
| -rw-r--r-- | units/graphics/jobs.pxu | 9 | ||||
| -rw-r--r-- | units/graphics/legacy.pxu | 3 |
2 files changed, 5 insertions, 7 deletions
diff --git a/units/graphics/jobs.pxu b/units/graphics/jobs.pxu index 154f036..bf03878 100644 --- a/units/graphics/jobs.pxu +++ b/units/graphics/jobs.pxu @@ -69,8 +69,7 @@ category_id: com.canonical.plainbox::graphics id: graphics/{index}_resolution_{product_slug} requires: device.category == 'VIDEO' - package.name == 'zenity' -command: resolution_test.py | zenity --text-info +command: resolution_test.py estimated_duration: 10.00 _summary: Test default resolution for {vendor} {product} _description: @@ -78,7 +77,7 @@ _description: This test will verify the default display resolution on the {vendor} {product} graphics card. STEPS: 1. Click "Test". - 2. Confirm that the resolution shown in the text window is acceptable for your display. + 2. Confirm that the resolution shown is acceptable for your display. VERIFICATION: Is the resolution shown acceptable for your display on {vendor} {product} graphics card? @@ -128,14 +127,14 @@ plugin: user-interact-verify category_id: com.canonical.plainbox::graphics requires: device.category == 'VIDEO' - package.name == 'zenity' command: # shellcheck disable=SC1091 source graphics_env.sh {driver} {index} maxi="$(xrandr -q |grep -A 1 "connected\( primary\)* [0-9]" |tail -1 |awk '{{print $1}}')" now="$(python3 -c 'from gi.repository import Gdk; screen=Gdk.Screen.get_default(); geo = screen.get_monitor_geometry(screen.get_primary_monitor()); print(geo.width, "x", geo.height, sep="")')" test "$maxi" != "$now" && notify="\nPlease switch to the maximum resolution \nfor every graphic tests" - zenity --info --text "Maximum resolution: $maxi\nCurrent resolution: $now $notify" + echo "Maximum resolution: $maxi" + echo "Current resolution: $now $notify" estimated_duration: 10.0 _summary: Test maximum supported resolution for {vendor} {product} _description: diff --git a/units/graphics/legacy.pxu b/units/graphics/legacy.pxu index a58e55a..c2f2b53 100644 --- a/units/graphics/legacy.pxu +++ b/units/graphics/legacy.pxu @@ -78,8 +78,7 @@ category_id: com.canonical.plainbox::graphics id: graphics/maximum_resolution requires: device.category == 'VIDEO' - package.name == 'zenity' -command: zenity --info --text "Maximum resolution: $(xrandr -q |grep -A 1 "connected\( primary\)* [0-9]" |tail -1 |awk '{print $1}')" +command: echo "Maximum resolution: $(xrandr -q |grep -A 1 "connected\( primary\)* [0-9]" |tail -1 |awk '{print $1}')" estimated_duration: 10 _summary: Test maximum supported resolution _description: |