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

Proposed by Jeff Lane 
Status: Merged
Merged at revision: 1683
Proposed branch: lp:~bladernr/checkbox/1053032
Merge into: lp:checkbox
Diff against target: 79 lines (+18/-20) (has conflicts)
2 files modified
debian/changelog (+10/-0)
jobs/usb.txt.in (+8/-20)
Text conflict in debian/changelog
To merge this branch: bzr merge lp:~bladernr/checkbox/1053032
Reviewer Review Type Date Requested Status
Marc Tardif (community) Approve
Jeff Lane  Needs Resubmitting
Review via email: mp+125300@code.launchpad.net

Description of the change

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

To post a comment you must log in.
Revision history for this message
Marc Tardif (cr3) wrote :

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

review: Needs Fixing
lp:~bladernr/checkbox/1053032 updated
1676. By Jeff Lane 

changelog cleanup

Revision history for this message
Jeff Lane  (bladernr) wrote :

fixed

review: Needs Resubmitting
Revision history for this message
Marc Tardif (cr3) wrote :

Okie dokie.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2012-09-19 19:05:43 +0000
3+++ debian/changelog 2012-09-19 20:12:20 +0000
4@@ -22,6 +22,7 @@
5 connections. This is necessary for adequate QA testing (LP: #1042425)
6 * scripts/graphics_driver: fixed a bug causing the hybrid check to throw an
7 exception on hybrid systems (LP: #1048058)
8+<<<<<<< TREE
9 * setup.py: added checkbox.dbus to packages (LP: #1052601)
10 * jobs/optical.txt.in: removed the optical/dvd_movie_playback job definition
11 as it was redundant (LP: #868643)
12@@ -30,6 +31,11 @@
13 * [FEATURE] jobs/bluetooth.txt.in: removed the bluetooth/keyboard job
14 and modified bluetooth/mouse to be bluetooth/HID and allow the tester
15 to choose a device to use. (LP: #1053010)
16+=======
17+ * [FEATURE] jobs/usb.txt.in: replaced the usb/mouse and usb/keyboard tests
18+ with usb/HID to combine them so the tester can choose one device rather
19+ than requiring multiple devices. (LP: #1053032)
20+>>>>>>> MERGE-SOURCE
21
22 [Daniel Manrique]
23 * Bumped to 0.14.6 to keep changelog size sane and fix a small mishap in the
24@@ -122,7 +128,11 @@
25 the 'device' argument (bus type) and require at least one value
26 * [FEATURE] scripts/removable_storage_watcher: add support for debugging
27
28+<<<<<<< TREE
29 -- Jeff Lane <jeff@ubuntu.com> Wed, 19 Sep 2012 13:09:08 -0400
30+=======
31+ -- Jeff Lane <jeff@ubuntu.com> Wed, 19 Sep 2012 14:20:15 -0400
32+>>>>>>> MERGE-SOURCE
33
34 checkbox (0.14.5) quantal; urgency=low
35
36
37=== modified file 'jobs/usb.txt.in'
38--- jobs/usb.txt.in 2012-08-22 18:51:58 +0000
39+++ jobs/usb.txt.in 2012-09-19 20:12:20 +0000
40@@ -23,31 +23,19 @@
41 Were the drives detected?
42
43 plugin: manual
44-name: usb/keyboard
45+name: usb/HID
46 depends: usb/detect
47 requires: package.name == 'linux'
48 command: keyboard_test
49 _description:
50 PURPOSE:
51- This test will check your USB connection.
52- STEPS:
53- 1. Plug a USB keyboard into the computer.
54- 2. Click on "Test" and enter some text.
55- VERIFICATION:
56- Does the keyboard work?
57-
58-plugin: manual
59-name: usb/mouse
60-depends: usb/detect
61-requires: package.name == 'linux'
62-_description:
63- PURPOSE:
64- This test will check your USB connection.
65- STEPS:
66- 1. Plug a USB mouse into the computer.
67- 2. Perform some single/double/right click operations.
68- VERIFICATION:
69- Does the mouse work correctly?
70+ This test will check that you can use a USB HID device
71+ STEPS:
72+ 1. Enable either a USB mouse or keyboard
73+ 2. For mice, perform actions such as moving the pointer, right and left button clicks and double clicks
74+ 3. For keyboards, click the Test button to lauch a small tool. Type some text and close the tool.
75+ VERIFICATION:
76+ Did the device work as expected?
77
78 plugin: manual
79 name: usb/insert

Subscribers

People subscribed via source and target branches