Merge lp:~cr3/checkbox/multitouch into lp:checkbox

[Marc Tardif]

Merged multitouch tests from cr3.

The results from testing a singletouch touchpad and a non-touch touchscreen are:

touchpad/singletouch-automated pass
touchpad/multitouch-automated fail
touchpad/multitouch-manual fail
touchscreen/nontouch-automated pass
touchscreen/multitouch-automated fail
touchscreen/multitouch-manual fail

To try on your system, this is a command that will only run the tests from this merge request:

rm -fr store messages checkbox.xsl checkbox.log plugins.bpickle* sub* ; ./bin/checkbox-qt -W <(cat <<EOF
`head -n 32 ./data/whitelists/default.whitelist`
__touchpad__
touchpad/singletouch-automated
touchpad/multitouch-automated
touchpad/multitouch-manual
__touchscreen__
touchscreen/nontouch-automated
touchscreen/multitouch-automated
touchscreen/multitouch-manual
EOF
)

[lp:~cr3/checkbox/multitouch]

1722. By Marc Tardif on 2012-09-28

Fixed filter_templates arguments for multitouch tests.

[Marc Tardif (cr3)]

After testing on an all-in-one system with a multitouch screen and a mouse, these were the results:

touchpad/singletouch-automated fail
touchpad/multitouch-automated pass
touchpad/multitouch-manual uninitiated
touchscreen/nontouch-automated fail
touchscreen/multitouch-automated pass
touchscreen/multitouch-manual uninitiated

The problem is that both the touchpad and the touchscreen were being filtered as the same device by this command:

  xinput_resource | filter_templates -w 'class=XITouchClass' -w 'touch_mode=dependent' -b 'name=Virtual core pointer'| grep 'name:'

and this command:

  xinput_resource | filter_templates -w 'class=XITouchClass' -w 'touch_mode=direct' -b 'name=Virtual core pointer'| grep 'name:'

The reason is that the whitelist arguments seem to be or'ed instead of and'ed. So, these commands were changed to:

  xinput_resource | filter_templates -w 'class=XITouchClass' | grep -q 'touch_mode: dependent'

and this command respectively:

  xinput_resource | filter_templates -w 'class=XITouchClass' | grep -q 'touch_mode: direct'

Since grep is now used in quiet mode, there's really no reason to blacklist the Virtual core pointer device anymore.

review: Needs Resubmitting

[Brendan Donegan (brendan-donegan)]

I think it's a bit strange that the changelog has seperate entries for the two different files, why not just mention both in the one?

review: Needs Information

[Marc Tardif (cr3)]

You have my blessing to modify the changelog entry as you please as you merge the code. Thanks!

[Daniel Manrique (roadmr)]

Massaging changelog while merging per the above comments. Thanks!

review: Approve

[TienFu Chen (ctf)]

I have tested, the submission is as below.
http://dl.dropbox.com/u/2747034/ctf_submission.xml

touchpad/singletouch-automated: FAILED
touchpad/multitouch-automated: PASSED
touchpad/singletouch-manual: uninitiated
touchscreen/nontouch-automated: FAILED
touchscreen/multitouch-automated: PASSED
touchscreen/singletouch-manual: uninitiated

=== modified file 'debian/changelog'
--- debian/changelog	2012-09-28 16:29:41 +0000
+++ debian/changelog	2012-09-28 21:59:23 +0000
@@ -94,6 +94,10 @@
   * [FEATURE] tools/lint: Added script to consistently check syntax.
   * plugins/apport_prompt.py: Removed apport plugin that caused crashes
     when trying to send bug report (LP #1047857)
+  * [FEATURE] jobs/touchpad.txt.in: Added singletouch and multitouch for
+    touchpads.
+  * [FEATURE] jobs/touchscreen.txt.in: Added nontouch and multitouch for
+    touchscreens.
 
   [Sean Feole]
   * [FEATURE] scripts/battery_test: measures battery capacity before and after

=== modified file 'jobs/audio.txt.in'
--- jobs/audio.txt.in	2012-09-19 14:35:12 +0000
+++ jobs/audio.txt.in	2012-09-28 21:59:23 +0000
@@ -41,7 +41,7 @@
     1. Plug an external HDMI device with sound (Use second port if you have more than one hdmi interface)
     2. Click the Test button
  VERIFICATION:
-    1. Did you hear the sound from the HDMI device?
+    Did you hear the sound from the HDMI device?
 
 plugin: manual
 name: audio/playback_headphones

=== modified file 'jobs/graphics.txt.in'
--- jobs/graphics.txt.in	2012-08-29 11:10:51 +0000
+++ jobs/graphics.txt.in	2012-09-28 21:59:23 +0000
@@ -180,7 +180,7 @@
  STEPS:
      1. Take picture using USB webcam
  VERIFICATION:
-     1. Review attachment manually later
+     Review attachment manually later
 
 plugin: attachment
 name: screenshot.jpg
@@ -204,7 +204,7 @@
      1. Start a fullscreen video playback
      2. Take picture using USB webcam after a few seconds
  VERIFICATION:
-     1. Review attachment manually later
+     Review attachment manually later
 
 plugin: attachment
 name: screenshot_fullscreen_video.jpg

=== modified file 'jobs/led.txt.in'
--- jobs/led.txt.in	2012-08-07 13:10:23 +0000
+++ jobs/led.txt.in	2012-09-28 21:59:23 +0000
@@ -6,7 +6,7 @@
  STEPS:
      1. Power LED should be on while device is switched on
  VERIFICATION:
-     1. Does the power LED light as expected?
+     Does the power LED light as expected?
 
 plugin: manual
 name: led/battery-charging
@@ -17,7 +17,7 @@
      1. Let system run on battery for a while
      2. Plug in AC plug
  VERIFICATION:
-     1. Did the battery indicator LED turn orange?
+     Did the battery indicator LED turn orange?
 
 plugin: manual
 name: led/battery-charged
@@ -29,7 +29,7 @@
      2. Plug in AC
      3. Let system run on AC
  VERIFICATION:
-     1. Does the orange battery LED shut off when system is fully charged?
+     Does the orange battery LED shut off when system is fully charged?
 
 plugin: manual
 name: led/battery-low
@@ -40,7 +40,7 @@
      1. Let system run on battery for several hours
      2. Monitor battery LED carefully
  VERIFICATION:
-     1. Does the LED light orange when battery is low?
+     Does the LED light orange when battery is low?
 
 plugin: manual
 name: led/hdd
@@ -52,7 +52,7 @@
      1. Select "Test" to write and read a temporary file for a few seconds
      2. HDD LED should light when writing to/reading from HDD
  VERIFICATION:
-     1. Did the HDD LED light?
+     Did the HDD LED light?
 
 plugin: manual
 name: led/numeric-keypad
@@ -77,7 +77,7 @@
      1. Press "Block Cap Keys" to activate/deactivate cap keys blocking
      2. Cap Keys LED should be switched on/off every time the key is pressed
  VERIFICATION:
-     1. Did the Cap Keys LED light as expected?
+     Did the Cap Keys LED light as expected?
 
 plugin: manual
 name: led/wlan
@@ -93,7 +93,7 @@
      3. Select Test to open Firefox
      4. WLAN LED should flash while downloading data
  VERIFICATION:
-     1. Did the WLAN LED light and flash as expected?
+     Did the WLAN LED light and flash as expected?
 
 plugin: manual
 name: led/wlan-disabled
@@ -107,7 +107,7 @@
      3. Re-enable
      4. Use Network-Manager to disable WLAN
  VERIFICATION:
-     1. Did the LED turn off then WLAN is disabled?
+     Did the LED turn off then WLAN is disabled?
 
 plugin: manual
 name: led/bluetooth
@@ -121,7 +121,7 @@
      3. Switch bluetooth off from the panel applet
      4. Switch bluetooth back on
  VERIFICATION:
-     1. Did the bluetooth LED turn off and on twice?
+     Did the bluetooth LED turn off and on twice?
 
 plugin: manual
 name: led/camera
@@ -134,7 +134,7 @@
      1. Select Test to activate camera
      2. Camera LED should light for a few seconds
  VERIFICATION:
-     1. Did the camera LED light?
+     Did the camera LED light?
 
 plugin: manual
 name: led/touchpad
@@ -162,5 +162,5 @@
      3. Switch WLAN and Bluetooth off from the panel applet
      4. Switch them back on
  VERIFICATION:
-     1. Did the WLAN/Bluetooth LED light as expected?
+     Did the WLAN/Bluetooth LED light as expected?
 

=== modified file 'jobs/suspend.txt.in'
--- jobs/suspend.txt.in	2012-09-12 16:09:15 +0000
+++ jobs/suspend.txt.in	2012-09-28 21:59:23 +0000
@@ -523,7 +523,7 @@
  STEPS:
      1. Take picture using USB webcam
  VERIFICATION:
-     1. Review attachment manually later
+     Review attachment manually later
 
 plugin: attachment
 name: screenshot_after_suspend.jpg
@@ -550,7 +550,7 @@
      3. Launch an HTML5 video playback in firefox
      4. Suspend/resume
  VERIFICATION:
-     1. After a 60s workload, check kern.log for reported GPU errors
+     After a 60s workload, check kern.log for reported GPU errors
 
 plugin: shell
 name: suspend/wifi_resume_time

=== modified file 'jobs/touchpad.txt.in'
--- jobs/touchpad.txt.in	2012-09-23 18:36:11 +0000
+++ jobs/touchpad.txt.in	2012-09-28 21:59:23 +0000
@@ -8,7 +8,7 @@
      2. Try to move pointer using touchpad
      3. Pointer should move accordingly
  VERIFICATION:
-     1. Did touchpad work as expected?
+     Did touchpad work as expected?
 
 plugin: manual
 name: touchpad/horizontal
@@ -23,7 +23,7 @@
      2. Select "Test" when ready and place your cursor within the borders of the displayed test window.
      3. Verify that you can move the horizontal slider by moving your finger side by side in the lower part of the touchpad
  VERIFICATION:
-     1. Did touchpad work as expected?
+     Did touchpad work as expected?
 
 plugin: manual
 name: touchpad/vertical
@@ -38,4 +38,27 @@
      2. Select "Test" when ready and place your cursor within the borders of the displayed test window.
      3. Verify that you can move the vertical slider by moving your finger side by side in the right part of the touchpad
  VERIFICATION:
-     1. Did touchpad work as expected?
+     Did touchpad work as expected?
+
+plugin: shell
+name: touchpad/singletouch-automated
+command: !(xinput_resource | filter_templates -w 'class=XITouchClass' | grep -q 'touch_mode: dependent')
+_description:
+ Determine whether the touchpad is detected as a singletouch device automatically.
+
+plugin: shell
+name: touchpad/multitouch-automated
+command: xinput_resource | filter_templates -w 'class=XITouchClass' | grep -q 'touch_mode: dependent'
+_description:
+ Determine whether the touchpad is detected as a multitouch device automatically.
+
+plugin: manual
+name: touchpad/multitouch-manual
+depends: touchpad/singletouch-automated
+_description:
+ PURPOSE:
+     Touchpad manual detection of multitouch.
+ STEPS:
+     1. Look at the specifications for your system.
+ VERIFICATION:
+     Is the touchpad supposed to be multitouch?

=== modified file 'jobs/touchscreen.txt.in'
--- jobs/touchscreen.txt.in	2012-08-09 09:14:16 +0000
+++ jobs/touchscreen.txt.in	2012-09-28 21:59:23 +0000
@@ -30,3 +30,25 @@
  VERIFICATION:
      Does the screen zoom in and out?
 
+plugin: shell
+name: touchscreen/nontouch-automated
+command: !(xinput_resource | filter_templates -w 'class=XITouchClass' | grep -q 'touch_mode: direct')
+_description:
+ Determine whether the screen is detected as a non-touch device automatically.
+
+plugin: shell
+name: touchscreen/multitouch-automated
+command: xinput_resource | filter_templates -w 'class=XITouchClass' | grep -q 'touch_mode: direct'
+_description:
+ Determine whether the screen is detected as a multitouch device automatically.
+
+plugin: manual
+name: touchscreen/multitouch-manual
+depends: touchscreen/nontouch-automated
+_description:
+ PURPOSE:
+     Touchscreen manual detection of multitouch.
+ STEPS:
+     1. Look at the specifications for your system.
+ VERIFICATION:
+     Is the screen supposed to be multitouch?