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

[Jeff Lane ]

Like the bluetooth changes, combined usb/mouse and usb/keyboard into a single test so the user only needs one device rather than two for testing

[Marc Tardif (cr3)]

string changes should be accompanied with [FEATURE] in the changelog.

review: Needs Fixing

[lp:~bladernr/checkbox/1053032]

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

changelog cleanup

[Jeff Lane  (bladernr)]

fixed

review: Needs Resubmitting

[Marc Tardif (cr3)]

Okie dokie.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-09-19 19:05:43 +0000
+++ debian/changelog	2012-09-19 20:12:20 +0000
@@ -22,6 +22,7 @@
     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)
+<<<<<<< TREE
   * setup.py: added checkbox.dbus to packages (LP: #1052601)
   * jobs/optical.txt.in: removed the optical/dvd_movie_playback job definition
     as it was redundant (LP: #868643)
@@ -30,6 +31,11 @@
   * [FEATURE] 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)
+=======
+  * [FEATURE] jobs/usb.txt.in: replaced the usb/mouse and usb/keyboard tests 
+    with usb/HID to combine them so the tester can choose one device rather 
+    than requiring multiple devices. (LP: #1053032)
+>>>>>>> MERGE-SOURCE
 
   [Daniel Manrique]
   * Bumped to 0.14.6 to keep changelog size sane and fix a small mishap in the
@@ -122,7 +128,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 13:09:08 -0400
+=======
+ -- Jeff Lane <[e-mail]>  Wed, 19 Sep 2012 14:20:15 -0400
+>>>>>>> MERGE-SOURCE
 
 checkbox (0.14.5) quantal; urgency=low
 
 
=== modified file 'jobs/usb.txt.in'
--- jobs/usb.txt.in	2012-08-22 18:51:58 +0000
+++ jobs/usb.txt.in	2012-09-19 20:12:20 +0000
@@ -23,31 +23,19 @@
      Were the drives detected?
 
 plugin: manual
-name: usb/keyboard
+name: usb/HID
 depends: usb/detect
 requires: package.name == 'linux'
 command: keyboard_test
 _description:
  PURPOSE:
-     This test will check your USB connection.
- STEPS:
-     1. Plug a USB keyboard into the computer.
-     2. Click on "Test" and enter some text.
- VERIFICATION:
-     Does the keyboard work?
-
-plugin: manual
-name: usb/mouse
-depends: usb/detect
-requires: package.name == 'linux'
-_description:
- PURPOSE:
-     This test will check your USB connection.
- STEPS:
-     1. Plug a USB mouse into the computer.
-     2. Perform some single/double/right click operations.
- VERIFICATION:
-     Does the mouse work correctly?
+     This test will check that you can use a USB HID device
+ STEPS:
+     1. Enable either a USB mouse or keyboard
+     2. For mice, perform actions such as moving the pointer, right and left button clicks and double clicks
+     3. For keyboards, click the Test button to lauch a small tool. Type some text and close the tool.
+ VERIFICATION:
+     Did the device work as expected?
 
 plugin: manual
 name: usb/insert