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

[Jeff Lane ]

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.

[Zygmunt Krynicki (zyga)]

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

[Jeff Lane  (bladernr)]

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.

[Zygmunt Krynicki (zyga)]

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

[Zygmunt Krynicki (zyga)]

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

[Zygmunt Krynicki (zyga)]

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

review: Approve

[Zygmunt Krynicki (zyga)]

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

text conflict in debian/changelog

[lp:~bladernr/checkbox/1157606-clean-up-led-test-descriptions]

2039. By Zygmunt Krynicki on 2013-04-11

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

2040. By Brendan Donegan on 2013-04-11

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

2041. By Jeff Lane  on 2013-04-11

Surprise, surprise, Tarmac choked as always. Rebasing.

[Jeff Lane  (bladernr)]

rebased.

=== 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 @@
   [ Jeff Lane ]
   * jobs/info.txt.in: fixed bad driver name in audio_codecs job (LP: #1165215)
   * jobs/mediacard.txt.in: reduce test file size for MMC to 64MB (LP: #1167214)
+  * jobs/led.txt.in, jobs/suspend.txt.in: removed bits about WLAN LED flashing
+    from the WLAN jobs as that no longer happens on data tx/rx (LP: #1157606)
 
-   [ Jeff Marcom ]
-   * scripts/virtualization - Fixes issue where console terminal would 
-     remain hijacked by child kvm process (LP: #1164028)
+  [ Jeff Marcom ]
+  * scripts/virtualization - Fixes issue where console terminal would 
+    remain hijacked by child kvm process (LP: #1164028)
 
    [ Daniel Manrique ]
    * checkbox/parsers/submission.py: Fixed incorrect context for memory

=== 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 @@
  STEPS:
      1. Make sure WLAN connection is established
      2. WLAN LED should light
-     3. Select Test to open Firefox
-     4. WLAN LED should flash while downloading data
  VERIFICATION:
-     Did the WLAN LED light and flash as expected?
+     Did the WLAN LED light as expected?
 
 plugin: manual
 name: led/wlan-disabled

=== 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 @@
  STEPS:
      1. Make sure WLAN connection is established
      2. WLAN LED should light
-     3. Select Test to open Firefox
-     4. WLAN LED should flash while downloading data
  VERIFICATION:
-     Did the WLAN LED light and flash as expected after resuming from suspend?
+     Did the WLAN LED light as expected after resuming from suspend?
 
 plugin: manual
 name: suspend/led_after_suspend/wlan-disabled