Merge lp:~bladernr/checkbox/926229-fix-multi_nic into lp:checkbox

Proposed by Jeff Lane on 2012-04-12
Status: Merged
Merged at revision: 1360
Proposed branch: lp:~bladernr/checkbox/926229-fix-multi_nic
Merge into: lp:checkbox
Diff against target: 44 lines (+13/-2) (has conflicts)
2 files modified
debian/changelog (+11/-0)
jobs/networking.txt.in (+2/-2)
Text conflict in debian/changelog
To merge this branch: bzr merge lp:~bladernr/checkbox/926229-fix-multi_nic
Reviewer Review Type Date Requested Status
Daniel Manrique 2012-04-12 Approve on 2012-04-12
Review via email: mp+101736@code.launchpad.net

Description of the change

forgot to request this last night... this removes dhclient from the multi_nic test to avoid the bug where the first run would hang on eth0...

To post a comment you must log in.
Daniel Manrique (roadmr) wrote :

Looks good, just don't forget to add a note to the user indicating that having all interfaces configured before running this :)

Merging...

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-04-11 23:26:26 +0000
3+++ debian/changelog 2012-04-12 13:32:18 +0000
4@@ -16,6 +16,7 @@
5 when testing is incomplete. (LP: #967457)
6 * [FEATURE] Modified stress jobs so that they are all automated per decision
7 made during the cert sprint.
8+<<<<<<< TREE
9
10 [Daniel Manrique]
11 * jobs/optical.txt.in: Change test descriptions to avoid confusing
12@@ -26,6 +27,16 @@
13 removable_storage_test commands (LP: #979356)
14
15 -- Jeff Lane <jeff@ubuntu.com> Wed, 11 Apr 2012 19:23:45 -0400
16+=======
17+ * Removed dhclient call from networking/multi_nic tests because of a bug in
18+ dhclient that can cause it to hang when run on eth0. New test requirement
19+ will be that the tester must configure and bring up all ethernet devices
20+ prior to running checkbox. Also added a check to make sure we're not trying
21+ to run the test on a device that's not active. (LP: #926229)
22+
23+
24+ -- Jeff Lane <jeff@ubuntu.com> Wed, 11 Apr 2012 17:19:38 -0400
25+>>>>>>> MERGE-SOURCE
26
27 checkbox (0.13.6) precise; urgency=low
28
29
30=== modified file 'jobs/networking.txt.in'
31--- jobs/networking.txt.in 2012-02-03 19:58:17 +0000
32+++ jobs/networking.txt.in 2012-04-12 13:32:18 +0000
33@@ -110,9 +110,9 @@
34 cat <<'EOF' | run_templates -s 'udev_resource | filter_templates -w "category=NETWORK" | awk "/path: / { print \$2 }" | xargs -n 1 sh -c "for i in \`ls /sys\$0/net 2>/dev/null\`; do echo \$0 \$i; done"'
35 plugin: shell
36 name: networking/multi_nic_$2
37- requires: device.path == "$1" and package.name == 'linux'
38+ requires: device.path == "$1" and package.name == 'linux' and package.name == 'ethtool'
39 user: root
40- command: dhclient $2; network_bandwidth_test --interface=$2 --scan=3 --log-level=debug
41+ command: ethtool $2 | tail -1 | grep "detected: yes" && network_bandwidth_test --interface=$2 --scan=3 --log-level=debug
42 description:
43 Testing for NIC $2
44 EOF

Subscribers

People subscribed via source and target branches