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

[Jeff Lane ]

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.

[Marc Tardif (cr3)]

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

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-09-19 14:35:12 +0000
+++ debian/changelog	2012-09-19 16:54:26 +0000
@@ -22,6 +22,8 @@
     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/keys.txt.in: modified the battery info key job to use the keys_test
+    script as we do with other hotkey tests (LP: #990538)
 
   [Daniel Manrique]
   * Bumped to 0.14.6 to keep changelog size sane and fix a small mishap in the
@@ -114,7 +116,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 11:53:49 -0400
+>>>>>>> MERGE-SOURCE
 
 checkbox (0.14.5) quantal; urgency=low
 
 
=== modified file 'jobs/keys.txt.in'
--- jobs/keys.txt.in	2012-05-31 14:45:25 +0000
+++ jobs/keys.txt.in	2012-09-19 16:54:26 +0000
@@ -46,13 +46,17 @@
 plugin: manual
 name: keys/battery-info
 requires: dmi.product in ['Notebook','Laptop','Portable']
+comand: key_test -s '0xe071,0xef1:Battery Info'
 _description:
  PURPOSE:
      This test will test the battery information key
  STEPS:
-     1. Press the battery information key on the keyboard
+     If you do not have a Battery Button, skip this test
+     1. Click Test to begin
+     2. Press the Battery Info button (or combo like Fn+F3)
+     3: Close the Power Statistics tool if it opens
  VERIFICATION:
-     Did a notification appear showing the battery status?
+     Did the Battery Info key work as expected?
 
 plugin: manual
 name: keys/wireless