units:touchpad: Remove singletouch-automated and multitouch-automated

All modern touchpads are multitouch and those two jobs sometimes return false alarms. touchpad/detected-as-mouse is a better test to identify issues. Fixes: lp:1415358 

2 files changed, 0 insertions, 34 deletions

diff --git a/units/touchpad/jobs.pxu b/units/touchpad/jobs.pxu
index fa6d9eb..2fba8ad 100644
--- a/units/touchpad/jobs.pxu
+++ b/units/touchpad/jobs.pxu
@@ -52,33 +52,10 @@ _siblings:
 [{ "id": "touchpad/vertical-after-suspend",
 "depends": "suspend/suspend_advanced touchpad/vertical" }]
 
-plugin: shell
-category_id: com.canonical.plainbox::touchpad
-id: touchpad/singletouch-automated
-requires:
- dmi.product in ['Notebook','Laptop','Portable','Convertible']
- xinput.device_class == 'XITouchClass' and xinput.touch_mode != 'dependent'
-command: true
-estimated_duration: 1.2
-_purpose:
- Determine whether the touchpad is detected as a singletouch device automatically.
-
-plugin: shell
-category_id: com.canonical.plainbox::touchpad
-id: touchpad/multitouch-automated
-estimated_duration: 1.2
-requires:
- dmi.product in ['Notebook','Laptop','Portable','Convertible']
- xinput.device_class == 'XITouchClass' and xinput.touch_mode == 'dependent'
-command: true
-_purpose:
- Determine whether the touchpad is detected as a multitouch device automatically.
-
 plugin: manual
 category_id: com.canonical.plainbox::touchpad
 id: touchpad/multitouch-manual
 requires: dmi.product in ['Notebook','Laptop','Portable','Convertible']
-depends: touchpad/singletouch-automated
 estimated_duration: 120.0
 _purpose:
 Touchpad manual detection of multitouch.
@@ -110,7 +87,6 @@ plugin: manual
 category_id: com.canonical.plainbox::touchpad
 id: touchpad/multitouch-rightclick
 requires: dmi.product in ['Notebook','Laptop','Portable','Convertible']
-depends: touchpad/multitouch-automated
 estimated_duration: 120.0
 _purpose:
 Determine that the right click function is working as expected.
@@ -179,7 +155,6 @@ plugin: manual
 category_id: com.canonical.plainbox::touchpad
 id: touchpad/multitouch-zoom
 requires: dmi.product in ['Notebook','Laptop','Portable','Convertible']
-depends: touchpad/multitouch-automated
 estimated_duration: 120.0
 _summary: Check touchpad pinch-to-zoom gesture
 _purpose:
@@ -195,7 +170,6 @@ plugin: manual
 category_id: com.canonical.plainbox::touchpad
 id: touchpad/multitouch-dash
 requires: dmi.product in ['Notebook','Laptop','Portable','Convertible']
-depends: touchpad/multitouch-automated
 estimated_duration: 120.0
 _summary: Check 4-finger tap gesture
 _purpose:
diff --git a/units/touchpad/test-plan.pxu b/units/touchpad/test-plan.pxu
index 78d7fa6..20da6c5 100644
--- a/units/touchpad/test-plan.pxu
+++ b/units/touchpad/test-plan.pxu
@@ -34,8 +34,6 @@ _description:
 Touchpad tests (Automated)
 include:
 touchpad/detected-as-mouse certification-status=blocker
- touchpad/singletouch-automated certification-status=blocker
- touchpad/multitouch-automated certification-status=blocker
 
 
 id: after-suspend-touchpad-cert-full
@@ -49,10 +47,8 @@ include:
 touchpad/continuous-move-after-suspend certification-status=blocker
 touchpad/horizontal-after-suspend certification-status=blocker
 touchpad/vertical-after-suspend certification-status=blocker
- touchpad/singletouch-automated-after-suspend certification-status=blocker
 touchpad/singletouch-selection-after-suspend certification-status=blocker
 touchpad/drag-and-drop-after-suspend certification-status=blocker
- touchpad/multitouch-automated-after-suspend certification-status=blocker
 touchpad/multitouch-manual-after-suspend certification-status=blocker
 touchpad/multitouch-rightclick-after-suspend certification-status=blocker
 touchpad/multitouch-horizontal-after-suspend certification-status=blocker
@@ -69,10 +65,8 @@ include:
 touchpad/continuous-move certification-status=blocker
 touchpad/horizontal certification-status=blocker
 touchpad/vertical certification-status=blocker
- touchpad/singletouch-automated certification-status=blocker
 touchpad/singletouch-selection certification-status=blocker
 touchpad/drag-and-drop certification-status=blocker
- touchpad/multitouch-automated certification-status=blocker
 touchpad/multitouch-manual certification-status=blocker
 touchpad/multitouch-rightclick certification-status=blocker
 touchpad/multitouch-horizontal certification-status=blocker
@@ -88,10 +82,8 @@ include:
 touchpad/continuous-move-after-suspend certification-status=blocker
 touchpad/horizontal-after-suspend certification-status=blocker
 touchpad/vertical-after-suspend certification-status=blocker
- touchpad/singletouch-automated-after-suspend certification-status=blocker
 touchpad/singletouch-selection-after-suspend certification-status=blocker
 touchpad/drag-and-drop-after-suspend certification-status=blocker
- touchpad/multitouch-automated-after-suspend certification-status=blocker
 touchpad/multitouch-manual-after-suspend certification-status=blocker
 touchpad/multitouch-rightclick-after-suspend certification-status=blocker
 touchpad/multitouch-horizontal-after-suspend certification-status=blocker