Merge lp:~cr3/checkbox/cking_suite into lp:checkbox

Proposed by Marc Tardif
Status: Merged
Approved by: Javier Collado
Approved revision: 1410
Merged at revision: 1428
Proposed branch: lp:~cr3/checkbox/cking_suite
Merge into: lp:checkbox
Diff against target: 45 lines (+7/-5)
2 files modified
debian/changelog (+2/-0)
scripts/cking_suite (+5/-5)
To merge this branch: bzr merge lp:~cr3/checkbox/cking_suite
Reviewer Review Type Date Requested Status
Javier Collado (community) Approve
Review via email: mp+108822@code.launchpad.net

Description of the change

Converted the cking_suite script, even though it's not used anywhere, and tested it by running the following commands:

$ ./scripts/cking_suite battery-capacity/battery.sh
description: No description found
command: cd /tmp/checkbox.cking-scripts/battery-capacity; ./battery.sh
name: battery
plugin: shell

$ cd /tmp/checkbox.cking-scripts/battery-capacity; ./battery.sh
46650 mWh

To post a comment you must log in.
Revision history for this message
Javier Collado (javier.collado) wrote :

Everything looks fine:
- I run the test in the description successfully.
- flake8 (that supports python3) returns no errors.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2012-06-05 18:56:41 +0000
+++ debian/changelog 2012-06-05 20:16:23 +0000
@@ -12,6 +12,8 @@
12 a test for the Super key.12 a test for the Super key.
13 * [FEATURE] Added new interactive and auto-verifying touchpad scrolling13 * [FEATURE] Added new interactive and auto-verifying touchpad scrolling
14 test.14 test.
15 * [FEATURE] Python 2 to 3 conversion:
16 * scripts/cking_suite
15 * Removed sleep_test script no longer used by any test definition.17 * Removed sleep_test script no longer used by any test definition.
1618
17 [Daniel Manrique]19 [Daniel Manrique]
1820
=== modified file 'scripts/cking_suite'
--- scripts/cking_suite 2012-05-22 18:01:21 +0000
+++ scripts/cking_suite 2012-06-05 20:16:23 +0000
@@ -1,4 +1,4 @@
1#!/usr/bin/python1#!/usr/bin/env python3
22
3import os3import os
4import sys4import sys
@@ -16,18 +16,18 @@
1616
17def print_line(key, value):17def print_line(key, value):
18 if type(value) is list:18 if type(value) is list:
19 print "%s:" % key19 print("%s:" % key)
20 for v in value:20 for v in value:
21 print " %s" % v21 print(" %s" % v)
22 else:22 else:
23 print "%s: %s" % (key, value)23 print("%s: %s" % (key, value))
2424
2525
26def print_element(element):26def print_element(element):
27 for key, value in element.items():27 for key, value in element.items():
28 print_line(key, value)28 print_line(key, value)
2929
30 print30 print()
3131
3232
33def clone_cking_scripts(location, directory):33def clone_cking_scripts(location, directory):

Subscribers

People subscribed via source and target branches