From cb42ba9fa1d034df9441cd6ba48bc22a2b33ef80 Mon Sep 17 00:00:00 2001
From: Po-Hsu Lin <po-hsu.lin@canonical.com>
Date: Fri, 13 Feb 2015 17:47:37 +0800
Subject: Adding new touchpad checking to see if it's detected as a mouse

---
 jobs/touchpad.txt.in | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'jobs')

diff --git a/jobs/touchpad.txt.in b/jobs/touchpad.txt.in
index 1983e26..e7d2039 100644
--- a/jobs/touchpad.txt.in
+++ b/jobs/touchpad.txt.in
@@ -190,3 +190,23 @@ _description:
  VERIFICATION:
      Did the tap open the Dash?
 
+plugin: user-interact
+id: touchpad/detected-as-mouse
+requires: dmi.product in ['Notebook','Laptop','Portable']
+estimated_duration: 30.0
+command:
+    xinput list --name-only | grep "PS/2 Generic Mouse"
+    if [ $? ]; then
+        zenity --info --text "Oops, your touchpad seems to be detected as a mouse"
+        exit 1
+    else
+        touchpad_driver_info
+    fi 
+_description:
+ PURPOSE:
+     This test will test if your touchpad was detected as a mouse
+ STEPS:
+     1. Please disconnect any external mouse / pointing device and click on Test
+ VERIFICATION:
+     The verification of this test is automated.
+
-- 
cgit v1.2.3


From aa20601f7d5b898bbbbd848860379ecd3568271c Mon Sep 17 00:00:00 2001
From: Po-Hsu Lin <po-hsu.lin@canonical.com>
Date: Mon, 2 Mar 2015 11:42:36 +0800
Subject: touchpad/detected-as-mouse: changed into a non-interactive shell job
 by using touchpad_driver_info output only

---
 jobs/touchpad.txt.in | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

(limited to 'jobs')

diff --git a/jobs/touchpad.txt.in b/jobs/touchpad.txt.in
index e7d2039..7ca22fc 100644
--- a/jobs/touchpad.txt.in
+++ b/jobs/touchpad.txt.in
@@ -190,23 +190,18 @@ _description:
  VERIFICATION:
      Did the tap open the Dash?
 
-plugin: user-interact
+plugin: shell
 id: touchpad/detected-as-mouse
 requires: dmi.product in ['Notebook','Laptop','Portable']
-estimated_duration: 30.0
+estimated_duration: 1.2
 command:
-    xinput list --name-only | grep "PS/2 Generic Mouse"
-    if [ $? ]; then
-        zenity --info --text "Oops, your touchpad seems to be detected as a mouse"
-        exit 1
+    info=`touchpad_driver_info`
+    if [ $? -eq 0 ]; then
+        echo "touchpad detected with driver: $info"
     else
-        touchpad_driver_info
+        echo "$info"
+        exit 1
     fi 
 _description:
- PURPOSE:
-     This test will test if your touchpad was detected as a mouse
- STEPS:
-     1. Please disconnect any external mouse / pointing device and click on Test
- VERIFICATION:
-     The verification of this test is automated.
+ This test will check if your touchpad was detected as a mouse.
 
-- 
cgit v1.2.3


From 18e391c545dda79e775a33fb92e40ee9d9857b4c Mon Sep 17 00:00:00 2001
From: Po-Hsu Lin <po-hsu.lin@canonical.com>
Date: Thu, 5 Mar 2015 21:18:05 +0800
Subject: Adjust the output format

---
 jobs/touchpad.txt.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'jobs')

diff --git a/jobs/touchpad.txt.in b/jobs/touchpad.txt.in
index 7ca22fc..433f17c 100644
--- a/jobs/touchpad.txt.in
+++ b/jobs/touchpad.txt.in
@@ -197,7 +197,7 @@ estimated_duration: 1.2
 command:
     info=`touchpad_driver_info`
     if [ $? -eq 0 ]; then
-        echo "touchpad detected with driver: $info"
+        echo -e "touchpad detected with:\n$info"
     else
         echo "$info"
         exit 1
-- 
cgit v1.2.3