Checkbox

Merge lp:~roadmr/checkbox/861404 into lp:checkbox

  1. 861404
  2. Merge into trunk
Proposed by Daniel Manrique
Status: Merged
Merged at revision: 1079
Proposed branch: lp:~roadmr/checkbox/861404
Merge into: lp:checkbox
Diff against target: 37 lines (+5/-3)
2 files modified
debian/changelog (+3/-1)
scripts/internet_test (+2/-2)
To merge this branch: bzr merge lp:~roadmr/checkbox/861404
Reviewer Review Type Date Requested Status
Jeff Lane  Approve
Review via email: mp+77392@code.launchpad.net

Description of the change

Just removed the -R parameter from internet_test. We don't use the additional info it provides, and it is known to cause at least one network/router to drop packets, thus falsely indicating the test doesn't work.

Despite the "fast track" policy for trivial changes, I'd appreciate a second set of eyeballs to look at this code before merging, as I'd prefer to avoid introducing a new bug hours before final freeze.

To post a comment you must log in.
Revision history for this message
Jeff Lane  (bladernr) wrote :

merged

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 2011-09-28 18:20:25 +0000
3+++ debian/changelog 2011-09-28 19:23:28 +0000
4@@ -19,6 +19,8 @@
5 * Add warning prior to starting the tests (LP: #855328)
6 * Apport integration: Fix instantiation of Gtk.RadioButton, needed due
7 to PyGI related API changes (LP: #805679)
8+ * Remove ping -R parameter that apparently caused ICMP packets to be dropped
9+ by some routers (LP: #861404)
10
11 [ Evan Broder ]
12 * Replace resolution_test with an implementation which uses GdkScreen to
13@@ -37,7 +39,7 @@
14 [Ara Pulido]
15 * Avoid connect_wireless messing with AP with similar names (LP: #861538)
16
17- -- Daniel Manrique <daniel.manrique@canonical.com> Sun, 25 Sep 2011 20:02:12 -0400
18+ -- Daniel Manrique <daniel.manrique@canonical.com> Wed, 28 Sep 2011 15:09:49 -0400
19
20 checkbox (0.12.7) oneiric; urgency=low
21
22
23=== modified file 'scripts/internet_test'
24--- scripts/internet_test 2011-06-16 07:58:36 +0000
25+++ scripts/internet_test 2011-09-28 19:23:28 +0000
26@@ -81,9 +81,9 @@
27 return t1
28
29 def ping(host, interface, count, deadline, verbose=False):
30- command = "ping -R -c %s -w %s %s" % (count, deadline, host)
31+ command = "ping -c %s -w %s %s" % (count, deadline, host)
32 if interface:
33- command = "ping -I%s -R -c %s -w %s %s" % (interface, count, deadline, host)
34+ command = "ping -I%s -c %s -w %s %s" % (interface, count, deadline, host)
35
36 reg = re.compile(r"(\d) received")
37 packets_received = 0

Subscribers

People subscribed via source and target branches