Import plainbox-provider-checkbox_0.65.0~rc1.orig.tar.gzupstream-0.65.0_rc1patched-0.65.0_rc1-1

3 files changed, 1 insertions, 31 deletions

diff --git a/units/graphics/jobs.pxu b/units/graphics/jobs.pxu
index 4dde304..8206f1a 100644
--- a/units/graphics/jobs.pxu
+++ b/units/graphics/jobs.pxu
@@ -133,13 +133,7 @@ category_id: com.canonical.plainbox::graphics
 requires:
 device.category == 'VIDEO'
 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"
- echo "Maximum resolution: $maxi"
- echo "Current resolution: $now $notify"
+ graphics_max_resolution.py
 estimated_duration: 10.0
 _summary: Test maximum supported resolution for {vendor} {product}
 _description:
@@ -154,16 +148,6 @@ _description:
 
 unit: template
 template-resource: graphics_card
-id: graphics/{index}_modes_{product_slug}
-plugin: shell
-category_id: com.canonical.plainbox::graphics
-command: graphics_modes_info.py
-estimated_duration: 0.250
-_description: Collect info on graphics modes (screen resolution and refresh rate) for {vendor} {product}
-_summary: Test graphic modes info for {vendor} {product}
-
-unit: template
-template-resource: graphics_card
 id: graphics/{index}_color_depth_{product_slug}
 plugin: shell
 category_id: com.canonical.plainbox::graphics
diff --git a/units/graphics/legacy.pxu b/units/graphics/legacy.pxu
index 14969b0..2b9545d 100644
--- a/units/graphics/legacy.pxu
+++ b/units/graphics/legacy.pxu
@@ -96,14 +96,6 @@ _description:
 VERIFICATION:
 Is this the display's maximum resolution?
 
-id: graphics/modes
-plugin: shell
-category_id: com.canonical.plainbox::graphics
-command: graphics_modes_info.py
-estimated_duration: 0.250
-_description: Collect info on graphics modes (screen resolution and refresh rate)
-_summary: Collect info on graphics modes
-
 id: graphics/color_depth
 plugin: shell
 category_id: com.canonical.plainbox::graphics
diff --git a/units/graphics/test-plan.pxu b/units/graphics/test-plan.pxu
index 8725b0d..fe7d4a1 100644
--- a/units/graphics/test-plan.pxu
+++ b/units/graphics/test-plan.pxu
@@ -32,9 +32,6 @@ _description:
 Graphics tests (integrated GPU) (Automated)
 include:
 graphics/1_auto_switch_card_.* certification-status=blocker
- graphics/xorg-version certification-status=blocker
- graphics/xorg-failsafe certification-status=blocker
- graphics/xorg-process certification-status=blocker
 graphics/VESA_drivers_not_in_use certification-status=blocker
 graphics/1_driver_version_.* certification-status=blocker
 graphics/1_gl_support_.* certification-status=blocker
@@ -169,9 +166,6 @@ _name: Graphics tests (integrated GPU, certification blockers only)
 _description: Graphics tests (integrated GPU, certification blockers only)
 include:
 graphics/1_auto_switch_card_.* certification-status=blocker
- graphics/xorg-version certification-status=blocker
- graphics/xorg-failsafe certification-status=blocker
- graphics/xorg-process certification-status=blocker
 graphics/VESA_drivers_not_in_use certification-status=blocker
 graphics/1_maximum_resolution_.* certification-status=blocker
 graphics/1_glxgears_.* certification-status=blocker