Merge lp:~mbp/bzr/doc into lp:bzr

[Martin Pool]

update tc qdisc testing instructions

abentley pointed out that the simulated-slow-network instructions no longer work. (I think the kernel interface must have changed because I'm pretty sure they worked a couple of years ago.) These now do.

Another test that these actually pass would be welcome.

[John A Meinel (jameinel)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 8/4/2011 2:34 AM, Martin Pool wrote:
> Martin Pool has proposed merging lp:~mbp/bzr/doc into lp:bzr.
>
> Requested reviews: bzr-core (bzr-core) Related bugs: Bug #398653 in
> Bazaar: "Releasing guide should include instructions on updating
> trunk NEWS file" https://bugs.launchpad.net/bzr/+bug/398653 Bug
> #473099 in Bazaar: "Incorrect markup in centralized workflow
> tutorial" https://bugs.launchpad.net/bzr/+bug/473099 Bug #512385 in
> Bazaar: "Broken link to "quick start card" in online user guide"
> https://bugs.launchpad.net/bzr/+bug/512385 Bug #599187 in Bazaar:
> "selective commit not failing as documented"
> https://bugs.launchpad.net/bzr/+bug/599187 Bug #664898 in Bazaar:
> "latex release notes fails with unicode error"
> https://bugs.launchpad.net/bzr/+bug/664898 Bug #746237 in Bazaar:
> "Documentation markup bugs"
> https://bugs.launchpad.net/bzr/+bug/746237
>
> For more details, see:
> https://code.launchpad.net/~mbp/bzr/doc/+merge/70386
>
> abentley pointed out that the simulated-slow-network instructions no
> longer work. (I think the kernel interface must have changed because
> I'm pretty sure they worked a couple of years ago.) These now do.
>
> Another test that these actually pass would be welcome.

I agree that adding something would be nice. But needing root access to
test it seems risky. Not to mention having it accidentally set the
system to add 500ms delay on the loopback could be really terrible for pqm.

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk477UsACgkQJdeBCYSNAAMCVQCeLAjcaaOWqRgamQOB2Js5BqW3
BN0AnA0S2kezgibqhkOm4ny7ondLjwkU
=bNpJ
-----END PGP SIGNATURE-----

[Martin Pool (mbp)]

On 5 August 2011 23:16, John Arbash Meinel <email address hidden> wrote:
>> Another test that these actually pass would be welcome.
>
> I agree that adding something would be nice. But needing root access to
> test it seems risky. Not to mention having it accidentally set the
> system to add 500ms delay on the loopback could be really terrible for pqm.

Oh, I meant a human reviewer interactively running the tests. I agree
adding an automated test would be difficult and not especially useful.
 It would be better to actually use them from usertest.

Aaron added a script based on this to Launchpad.

  merge approve

m

review: Approve

[Martin Pool (mbp)]

sent to pqm by email

=== modified file 'doc/developers/testing.txt'
--- doc/developers/testing.txt	2011-07-05 05:16:33 +0000
+++ doc/developers/testing.txt	2011-08-04 00:34:34 +0000
@@ -1089,9 +1089,8 @@
 
     tc qdisc add dev lo root handle 1: prio
     tc qdisc add dev lo parent 1:3 handle 30: netem delay 500ms 
-    tc qdisc add dev lo parent 30:1 handle 40: prio
-    tc filter add dev lo protocol ip parent 1:0 prio 3 u32 match ip dport 4155 0xffff flowid 1:3 handle 800::800
-    tc filter add dev lo protocol ip parent 1:0 prio 3 u32 match ip sport 4155 0xffff flowid 1:3 handle 800::801
+    tc filter add dev lo protocol ip parent 1:0 prio 3 u32 match ip dport 4155 0xffff flowid 1:3 
+    tc filter add dev lo protocol ip parent 1:0 prio 3 u32 match ip sport 4155 0xffff flowid 1:3 
 
 and to remove this::