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

Proposed by Jeff Lane 
Status: Merged
Merged at revision: 1183
Proposed branch: lp:~bladernr/checkbox/912038
Merge into: lp:checkbox
Diff against target: 37 lines (+12/-1)
2 files modified
debian/changelog (+3/-1)
jobs/networking.txt.in (+9/-0)
To merge this branch: bzr merge lp:~bladernr/checkbox/912038
Reviewer Review Type Date Requested Status
Brendan Donegan (community) Approve
Jeff Lane  Needs Resubmitting
Review via email: mp+87695@code.launchpad.net

Description of the change

Added a test called networking/info_automated that is an automated version of networking/info

with one difference... this one also dumps the config of wireless devices as well as ethernet.

Tested on a VM with a single ethernet device and a laptop with one ethernet and one wi-fi (not running):

root@klaatu:/usr/share/checkbox# ./scripts/udev_resource | ./scripts/filter_templates -w "category=WIRELESS" -w "category=NETWORK"| awk "/path: / { print \$2 }"| xargs -n 1 sh -c "for i in \`ls /sys\$0/net 2>/dev/null\`; do .\/scripts\/network_info \$i; done"
Interface: eth0
Connected: Yes
IP: 192.168.1.11
MAC: 00:26:b9:63:e4:52

Interface: wlan0
Connected: No
IP: n/a
MAC: 00:21:6a:a8:03:22

So this should provide decent data regardless of whether the wireless or ethernet device is configured or in use...

To post a comment you must log in.
Revision history for this message
Brendan Donegan (brendan-donegan) wrote :

Looks like there are some conflicts in the changelog. Can you fix them and resubmit?

review: Needs Fixing
lp:~bladernr/checkbox/912038 updated
1162. By Jeff Lane 

merged in current trunk

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

You coulda fixed that while merging... it's because daniel has merged other things into trunk since I made this branch... in any case, I've merged the current trunk into my branch, fixed the changelog and pushed the update here.

review: Needs Resubmitting
Revision history for this message
Brendan Donegan (brendan-donegan) wrote :

Ok, merging it now.

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-01-09 11:45:22 +0000
3+++ debian/changelog 2012-01-09 22:32:23 +0000
4@@ -39,10 +39,12 @@
5 * Fixed spelling mistakes in user_apps job file. (LP: #904209)
6
7 [Jeff Lane]
8+ * Created automated network info test to get some config info during automated
9+ runs. (LP: #912038)
10 * Added requires to suspend wireless jobs so they won't run if wireless isn't
11 present (LP: #907150)
12
13- -- Daniel Manrique <daniel.manrique@canonical.com> Fri, 06 Jan 2012 17:14:39 -0500
14+ -- Jeff Lane <jeff@ubuntu.com> Mon, 09 Jan 2012 17:28:10 -0500
15
16 checkbox (0.13) precise; urgency=low
17
18
19=== modified file 'jobs/networking.txt.in'
20--- jobs/networking.txt.in 2011-10-07 18:59:33 +0000
21+++ jobs/networking.txt.in 2012-01-09 22:32:23 +0000
22@@ -30,6 +30,15 @@
23 VERIFICATION:
24 Is this correct?
25
26+plugin: shell
27+name: networking/info_automated
28+requires:
29+ package.name == 'network-manager'
30+ device.category == 'NETWORK'
31+command: udev_resource | filter_templates -w "category=WIRELESS" -w "category=NETWORK"| awk "/path: / { print \$2 }"| xargs -n 1 sh -c "for i in \`ls /sys\$0/net 2>/dev/null\`; do network_info \$i; done"
32+_description:
33+ This is an automated test to gather some info on the current state of your network devices. If no devices are found, the test will exit with an error.
34+
35 plugin: manual
36 name: networking/wired_connection
37 command: network_check

Subscribers

People subscribed via source and target branches