Merge lp:~bladernr/checkbox/1157606-clean-up-led-test-descriptions into lp:checkbox

Proposed by Jeff Lane 
Status: Merged
Approved by: Zygmunt Krynicki
Approved revision: 2041
Merged at revision: 2041
Proposed branch: lp:~bladernr/checkbox/1157606-clean-up-led-test-descriptions
Merge into: lp:checkbox
Diff against target: 51 lines (+7/-9)
3 files modified
debian/changelog (+5/-3)
jobs/led.txt.in (+1/-3)
jobs/suspend.txt.in (+1/-3)
To merge this branch: bzr merge lp:~bladernr/checkbox/1157606-clean-up-led-test-descriptions
Reviewer Review Type Date Requested Status
Zygmunt Krynicki (community) Approve
Review via email: mp+157907@code.launchpad.net

Description of the change

cleaned up the job descriptions per Jeffrey Chang's request to remove references of the WLAN LED flashing on data transfer. This apparently no longer happens with any current driver/wlan device.

Also, cleaned up the changelog just a bit where a previous entry was indented more than expected.

To post a comment you must log in.
Revision history for this message
Zygmunt Krynicki (zyga) wrote :

11 - [ Jeff Marcom ]
12 - * scripts/virtualization - Fixes issue where console terminal would
13 - remain hijacked by child kvm process (LP: #1164028)
14 + [ Jeff Marcom ]
15 + * scripts/virtualization - Fixes issue where console terminal would
16 + remain hijacked by child kvm process (LP: #1164028)

The indent is changed, why?

Otherwise looks okay

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

It bothered me that it didn't line up with the rest of the changelog entries. each of those lines was three spaces in rather than two, and sometimes I'm a bit obsessive/compulsive about things not lining up evenly.

Revision history for this message
Zygmunt Krynicki (zyga) wrote :

Thanks for the explanation. It would be easier if you split that to separate commits the next time so that the intent is obvious from reading of the commit messages

+1

review: Approve
Revision history for this message
Zygmunt Krynicki (zyga) wrote :

The attempt to merge lp:~bladernr/checkbox/1157606-clean-up-led-test-descriptions into lp:checkbox failed. Below is the output from the failed tests.

[precise] Bringing VM 'up'
[precise] Starting tests...
[precise] CheckBox test suite: pass
[precise] PlainBox test suite: pass
[precise] PlainBox documentation build: pass
[precise] Integration tests: pass
[precise] Destroying VM
[quantal] Bringing VM 'up'
[quantal] Starting tests...
[quantal] CheckBox test suite: pass
[quantal] PlainBox test suite: pass
[quantal] PlainBox documentation build: pass
[quantal] Integration tests: pass
[quantal] Destroying VM
[raring] Bringing VM 'up'
[raring] Starting tests...
[raring] CheckBox test suite: pass
[raring] PlainBox test suite: pass
[raring] PlainBox documentation build: pass
[raring] Integration tests: pass
[raring] Destroying VM
[precise] Bringing VM 'up'
[precise] Starting tests...
[precise] PlainBox development script (mk-venv.sh): pass
[precise] PlainBox development environment (plainbox --help): pass
[precise] Destroying VM
[quantal] Bringing VM 'up'
[quantal] Starting tests...
[quantal] PlainBox development script (mk-venv.sh): pass
[quantal] PlainBox development environment (plainbox --help): pass
[quantal] Destroying VM
[raring] Bringing VM 'up'
[raring] Unable to 'up' VM!
[raring] stdout: http://paste.ubuntu.com/5694700/
[raring] stderr: http://paste.ubuntu.com/5694701/
[raring] NOTE: unable to execute tests, marked as failed

Revision history for this message
Zygmunt Krynicki (zyga) wrote :

I re-ran that locally and it was all-ok. Could be temporary raring packaging mismatch.

review: Approve
Revision history for this message
Zygmunt Krynicki (zyga) wrote :

Attempt to merge into lp:checkbox failed due to conflicts:

text conflict in debian/changelog

2039. By Zygmunt Krynicki

"[r=zkrynicki][bug=][author=zkrynicki] automatic merge by tarmac"

2040. By Brendan Donegan

"[r=brendan-donegan][bug=][author=brendan-donegan] automatic merge by tarmac"

2041. By Jeff Lane 

Surprise, surprise, Tarmac choked as always. Rebasing.

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

rebased.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2013-04-11 14:32:52 +0000
+++ debian/changelog 2013-04-11 22:11:21 +0000
@@ -13,10 +13,12 @@
13 [ Jeff Lane ]13 [ Jeff Lane ]
14 * jobs/info.txt.in: fixed bad driver name in audio_codecs job (LP: #1165215)14 * jobs/info.txt.in: fixed bad driver name in audio_codecs job (LP: #1165215)
15 * jobs/mediacard.txt.in: reduce test file size for MMC to 64MB (LP: #1167214)15 * jobs/mediacard.txt.in: reduce test file size for MMC to 64MB (LP: #1167214)
16 * jobs/led.txt.in, jobs/suspend.txt.in: removed bits about WLAN LED flashing
17 from the WLAN jobs as that no longer happens on data tx/rx (LP: #1157606)
1618
17 [ Jeff Marcom ]19 [ Jeff Marcom ]
18 * scripts/virtualization - Fixes issue where console terminal would 20 * scripts/virtualization - Fixes issue where console terminal would
19 remain hijacked by child kvm process (LP: #1164028)21 remain hijacked by child kvm process (LP: #1164028)
2022
21 [ Daniel Manrique ]23 [ Daniel Manrique ]
22 * checkbox/parsers/submission.py: Fixed incorrect context for memory24 * checkbox/parsers/submission.py: Fixed incorrect context for memory
2325
=== modified file 'jobs/led.txt.in'
--- jobs/led.txt.in 2012-10-27 10:33:23 +0000
+++ jobs/led.txt.in 2013-04-11 22:11:21 +0000
@@ -90,10 +90,8 @@
90 STEPS:90 STEPS:
91 1. Make sure WLAN connection is established91 1. Make sure WLAN connection is established
92 2. WLAN LED should light92 2. WLAN LED should light
93 3. Select Test to open Firefox
94 4. WLAN LED should flash while downloading data
95 VERIFICATION:93 VERIFICATION:
96 Did the WLAN LED light and flash as expected?94 Did the WLAN LED light as expected?
9795
98plugin: manual96plugin: manual
99name: led/wlan-disabled97name: led/wlan-disabled
10098
=== modified file 'jobs/suspend.txt.in'
--- jobs/suspend.txt.in 2013-03-29 18:21:40 +0000
+++ jobs/suspend.txt.in 2013-04-11 22:11:21 +0000
@@ -957,10 +957,8 @@
957 STEPS:957 STEPS:
958 1. Make sure WLAN connection is established958 1. Make sure WLAN connection is established
959 2. WLAN LED should light959 2. WLAN LED should light
960 3. Select Test to open Firefox
961 4. WLAN LED should flash while downloading data
962 VERIFICATION:960 VERIFICATION:
963 Did the WLAN LED light and flash as expected after resuming from suspend?961 Did the WLAN LED light as expected after resuming from suspend?
964962
965plugin: manual963plugin: manual
966name: suspend/led_after_suspend/wlan-disabled964name: suspend/led_after_suspend/wlan-disabled

Subscribers

People subscribed via source and target branches