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

[Jeff Lane ]

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...

[Daniel Manrique (roadmr)]

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

=== modified file 'debian/changelog'
--- debian/changelog	2012-04-11 23:26:26 +0000
+++ debian/changelog	2012-04-12 13:32:18 +0000
@@ -16,6 +16,7 @@
     when testing is incomplete. (LP: #967457)
   * [FEATURE] Modified stress jobs so that they are all automated per decision
      made during the cert sprint.
+<<<<<<< TREE
 
   [Daniel Manrique]
   * jobs/optical.txt.in: Change test descriptions to avoid confusing
@@ -26,6 +27,16 @@
     removable_storage_test commands (LP: #979356)
 
  -- Jeff Lane <[e-mail]>  Wed, 11 Apr 2012 19:23:45 -0400
+=======
+  * Removed dhclient call from networking/multi_nic tests because of a bug in
+    dhclient that can cause it to hang when run on eth0. New test requirement
+    will be that the tester must configure and bring up all ethernet devices
+    prior to running checkbox. Also added a check to make sure we're not trying
+    to run the test on a device that's not active. (LP: #926229)
+
+
+ -- Jeff Lane <[e-mail]>  Wed, 11 Apr 2012 17:19:38 -0400
+>>>>>>> MERGE-SOURCE
 
 checkbox (0.13.6) precise; urgency=low
 
 
=== modified file 'jobs/networking.txt.in'
--- jobs/networking.txt.in	2012-02-03 19:58:17 +0000
+++ jobs/networking.txt.in	2012-04-12 13:32:18 +0000
@@ -110,9 +110,9 @@
  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"'
  plugin: shell
  name: networking/multi_nic_$2
- requires: device.path == "$1" and package.name == 'linux'
+ requires: device.path == "$1" and package.name == 'linux' and package.name == 'ethtool'
  user: root
- command: dhclient $2; network_bandwidth_test --interface=$2 --scan=3 --log-level=debug
+ command: ethtool $2 | tail -1 | grep "detected: yes" && network_bandwidth_test --interface=$2 --scan=3 --log-level=debug
  description:
   Testing for NIC $2
  EOF