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
1=== modified file 'debian/changelog'
2--- debian/changelog 2012-06-05 18:56:41 +0000
3+++ debian/changelog 2012-06-05 20:16:23 +0000
4@@ -12,6 +12,8 @@
5 a test for the Super key.
6 * [FEATURE] Added new interactive and auto-verifying touchpad scrolling
7 test.
8+ * [FEATURE] Python 2 to 3 conversion:
9+ * scripts/cking_suite
10 * Removed sleep_test script no longer used by any test definition.
11
12 [Daniel Manrique]
13
14=== modified file 'scripts/cking_suite'
15--- scripts/cking_suite 2012-05-22 18:01:21 +0000
16+++ scripts/cking_suite 2012-06-05 20:16:23 +0000
17@@ -1,4 +1,4 @@
18-#!/usr/bin/python
19+#!/usr/bin/env python3
20
21 import os
22 import sys
23@@ -16,18 +16,18 @@
24
25 def print_line(key, value):
26 if type(value) is list:
27- print "%s:" % key
28+ print("%s:" % key)
29 for v in value:
30- print " %s" % v
31+ print(" %s" % v)
32 else:
33- print "%s: %s" % (key, value)
34+ print("%s: %s" % (key, value))
35
36
37 def print_element(element):
38 for key, value in element.items():
39 print_line(key, value)
40
41- print
42+ print()
43
44
45 def clone_cking_scripts(location, directory):

Subscribers

People subscribed via source and target branches