Merge lp:~bladernr/checkbox/1053010 into lp:checkbox

[Jeff Lane ]

combined the bluetooth/mouse and bluetooth/keyboard tests into a single bluetooth/HID test to allow the tester to choose which device to use, rather than have a test that is often skipped.

[lp:~bladernr/checkbox/1053010]

1676. By Jeff Lane  on 2012-09-19

made a change to re-introduce keyboard_test as an option

[Marc Tardif (cr3)]

Awesome, but I had to add [FEATURE] to your changelog entry.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-09-19 14:35:12 +0000
+++ debian/changelog	2012-09-19 18:25:22 +0000
@@ -22,6 +22,9 @@
     connections. This is necessary for adequate QA testing (LP: #1042425)
   * scripts/graphics_driver: fixed a bug causing the hybrid check to throw an
     exception on hybrid systems (LP: #1048058)
+  * jobs/bluetooth.txt.in: removed the bluetooth/keyboard job and modified
+    bluetooth/mouse to be bluetooth/HID and allow the tester to choose a
+    device to use. (LP: #1053010)
 
   [Daniel Manrique]
   * Bumped to 0.14.6 to keep changelog size sane and fix a small mishap in the
@@ -114,7 +117,11 @@
     the 'device' argument (bus type) and require at least one value
   * [FEATURE] scripts/removable_storage_watcher: add support for debugging
 
+<<<<<<< TREE
  -- Jeff Lane <[e-mail]>  Wed, 19 Sep 2012 10:33:17 -0400
+=======
+ -- Jeff Lane <[e-mail]>  Wed, 19 Sep 2012 13:09:08 -0400
+>>>>>>> MERGE-SOURCE
 
 checkbox (0.14.5) quantal; urgency=low
 

=== modified file 'jobs/bluetooth.txt.in'
--- jobs/bluetooth.txt.in	2012-01-31 19:35:41 +0000
+++ jobs/bluetooth.txt.in	2012-09-19 18:25:22 +0000
@@ -59,34 +59,18 @@
      Did you hear the sound you recorded in the bluetooth
 
 plugin: manual
-name: bluetooth/keyboard
+name: bluetooth/HID
+depends: bluetooth/detect-output
 command: keyboard_test
-depends: bluetooth/detect-output
-_description:
- PURPOSE:
-     This test will check that you can use a bluetooth keyboard
- STEPS:
-     1. Enable the bluetooth keyboard
-     2. Click on the bluetooth icon in the menu bar
-     3. Select 'Setup new device'
-     4. Look for the device in the list and select it
-     5. Click "Test"
-     6. Enter some text
- VERIFICATION:
-     Were you able to enter some text with the bluetooth keyboard?
-
-plugin: manual
-name: bluetooth/mouse
-depends: bluetooth/detect-output
-_description:
- PURPOSE:
-     This test will check that you can use a bluetooth mouse
- STEPS:
-     1. Enable the bluetooth mouse
-     2. Click on the bluetooth icon in the menu bar
-     3. Select 'Setup new device'
-     4. Look for the device in the list and select it
-     5. Move the mouse around the screen
-     6. Perform some single/double/right click operations
- VERIFICATION:
-     Did the mouse work as expected?
+_description:
+ PURPOSE:
+     This test will check that you can use a BlueTooth HID device
+ STEPS:
+     1. Enable either a BT mouse or keyboard
+     2. Click on the bluetooth icon in the menu bar
+     3. Select 'Setup new device'
+     4. Look for the device in the list and select it
+     5. For mice, perform actions such as moving the pointer, right and left button clicks and double clicks
+     6. For keyboards, click the Test button to lauch a small tool. Enter some text into the tool and close it.
+ VERIFICATION:
+     Did the device work as expected?