Checkbox

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

  1. 990538
  2. Merge into trunk
Proposed by Jeff Lane 
Status: Merged
Merged at revision: 1681
Proposed branch: lp:~bladernr/checkbox/990538
Merge into: lp:checkbox
Diff against target: 48 lines (+12/-2) (has conflicts)
2 files modified
debian/changelog (+6/-0)
jobs/keys.txt.in (+6/-2)
Text conflict in debian/changelog
To merge this branch: bzr merge lp:~bladernr/checkbox/990538
Reviewer Review Type Date Requested Status
Marc Tardif (community) Approve
Review via email: mp+125272@code.launchpad.net

Description of the change

changed keys/battery_info so that it now uses the keys_test script. Unfortunately, it still opens the Power Statistics tool, but the verification is automatic using the script.

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

I took the liberty of adding [FEATURE] to your entry in the changelog while merging.

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 14:35:12 +0000
3+++ debian/changelog 2012-09-19 16:54:26 +0000
4@@ -22,6 +22,8 @@
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+ * jobs/keys.txt.in: modified the battery info key job to use the keys_test
9+ script as we do with other hotkey tests (LP: #990538)
10
11 [Daniel Manrique]
12 * Bumped to 0.14.6 to keep changelog size sane and fix a small mishap in the
13@@ -114,7 +116,11 @@
14 the 'device' argument (bus type) and require at least one value
15 * [FEATURE] scripts/removable_storage_watcher: add support for debugging
16
17+<<<<<<< TREE
18 -- Jeff Lane <jeff@ubuntu.com> Wed, 19 Sep 2012 10:33:17 -0400
19+=======
20+ -- Jeff Lane <jeff@ubuntu.com> Wed, 19 Sep 2012 11:53:49 -0400
21+>>>>>>> MERGE-SOURCE
22
23 checkbox (0.14.5) quantal; urgency=low
24
25
26=== modified file 'jobs/keys.txt.in'
27--- jobs/keys.txt.in 2012-05-31 14:45:25 +0000
28+++ jobs/keys.txt.in 2012-09-19 16:54:26 +0000
29@@ -46,13 +46,17 @@
30 plugin: manual
31 name: keys/battery-info
32 requires: dmi.product in ['Notebook','Laptop','Portable']
33+comand: key_test -s '0xe071,0xef1:Battery Info'
34 _description:
35 PURPOSE:
36 This test will test the battery information key
37 STEPS:
38- 1. Press the battery information key on the keyboard
39+ If you do not have a Battery Button, skip this test
40+ 1. Click Test to begin
41+ 2. Press the Battery Info button (or combo like Fn+F3)
42+ 3: Close the Power Statistics tool if it opens
43 VERIFICATION:
44- Did a notification appear showing the battery status?
45+ Did the Battery Info key work as expected?
46
47 plugin: manual
48 name: keys/wireless

Subscribers

People subscribed via source and target branches