From 601e30bd51bfcae9fb8fa2a1e97a8af6366798c4 Mon Sep 17 00:00:00 2001 From: Brian Swenson Date: Thu, 4 Oct 2012 13:51:42 -0400 Subject: [PATCH] bug 1340 ns3tcp-loss-suite.cc tests failing. New response generated --- src/test/ns3tcp/ns3tcp-loss-test-suite.cc | 4 ++-- ...ns3tcp-loss-NewReno2-response-vectors.pcap | Bin 16292 -> 16292 bytes ...ns3tcp-loss-NewReno3-response-vectors.pcap | Bin 16372 -> 16372 bytes ...ns3tcp-loss-NewReno4-response-vectors.pcap | Bin 16452 -> 16452 bytes .../ns3tcp-loss-Tahoe4-response-vectors.pcap | Bin 16692 -> 17492 bytes 5 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/ns3tcp/ns3tcp-loss-test-suite.cc b/src/test/ns3tcp/ns3tcp-loss-test-suite.cc index dbff6b13d..1174b83be 100644 --- a/src/test/ns3tcp/ns3tcp-loss-test-suite.cc +++ b/src/test/ns3tcp/ns3tcp-loss-test-suite.cc @@ -446,7 +446,7 @@ Ns3TcpLossTestSuite::Ns3TcpLossTestSuite () { SetDataDir (NS_TEST_SOURCEDIR); Packet::EnablePrinting (); // Enable packet metadata for all test cases -#if 0 + AddTestCase (new Ns3TcpLossTestCase ("Tahoe", 0)); AddTestCase (new Ns3TcpLossTestCase ("Tahoe", 1)); AddTestCase (new Ns3TcpLossTestCase ("Tahoe", 2)); @@ -464,7 +464,7 @@ Ns3TcpLossTestSuite::Ns3TcpLossTestSuite () AddTestCase (new Ns3TcpLossTestCase ("NewReno", 2)); AddTestCase (new Ns3TcpLossTestCase ("NewReno", 3)); AddTestCase (new Ns3TcpLossTestCase ("NewReno", 4)); -#endif + } static Ns3TcpLossTestSuite ns3TcpLossTestSuite; diff --git a/src/test/ns3tcp/response-vectors/ns3tcp-loss-NewReno2-response-vectors.pcap b/src/test/ns3tcp/response-vectors/ns3tcp-loss-NewReno2-response-vectors.pcap index f3672fdac2bea56a722d4694f1ce79b7397628fd..a39e236bbee6987c4aa1a9f3381c629f8ce5af4e 100644 GIT binary patch delta 1265 zcmYk*y-VD19LI56QU@RJV*L619HX9(r!nfOxenpBmK)MQ_mICJWR=2^q0oSQCD7ew z?jY&fK{|Jk{sRsD3qn`>9y`7GP4CY)ko%kao3G`l43G7t9ChVxOqXEHl?n^A$94IO z1MH2v@`O2>6T1At7@Y}M9x+8@QkP#7nLJ=J>5A6SN4|X?8X9`hZ#+NWemIhTLy2m* za^KJ;!Wzp)M_xCT3^!TOWC2!Kpsll@naLC8I^`+K7^5>q8B;V2${3<$xblDrYSX&> zKp)j~CN-ARu6Rn9VMPxEtgt|Ph8_;EH^ar4qd7|#V{~TeVv5Eb-B~WiWRBiEJ@iq{ zb0+I(K4>&N^L8(b%AiAzB-BF+t6wi#{roE=E{m ziQXpNO}ZFtW@20Pcn`2=aVO?zZqdaUoh`bUqOnaEL$tQ(VuIQZUG!1y(8UOAEYWK< zxwQWs9n=VAJsKojIhQM kJ(sRa*KNu>w<{Izg16nJ>$)%Bd=aPn_T{JFl6IH>0Vr>^mjD0& delta 1262 zcmYk*y-VD19LI6nN}%fLUG(C!o=@>vPd#&bYFt957CNK>*An^{1Xn49D|EOb-yn4B zkal)RQ|KJ>7lc5!4&nZSa;trhonHK=_vaf(bQj${CZnQ^nG%h@6Bn&9RlZ}011!<5 zm@jT#y_AoY*Ai4z=~qn2(HJ*neO#3;`dEzjB*ohaQ@jav6p`mAQs!vb%ADZ$w zp@~*CWw@%!dvq|VcI0bS6QyR#U*0ZSH5OoqgIZ5Yd{9jZRLYp6F-dunGWu9xiu#l( zQ&TKJ4>OEWtM_EMUXvg7Yl-TrC>lL<(bDK)hyyIqo;Ia5O&0^~V~)lQ-5I**V==?U zcsomPmLA5a&2i@(ccOy{MySlwMHj7kx)|aBOSBj0F3?@*Nr1*8y+wNHV}U8^OWe6c z7d^}{Ms1nyGF@~q!3dQGU3AfE(8Ul3jZgBYp~=Gvcdl?J=4h+jP;v1S3>-=x*2K?apVhcIfgh(cY!IOBVy|V~)li-95VKV}U8^`*io|qK6sA zs2$KfpoMf|B%L!Cfy?z9I*gX)Q?$k z%mVZEUN8Lvo4&Q* diff --git a/src/test/ns3tcp/response-vectors/ns3tcp-loss-NewReno3-response-vectors.pcap b/src/test/ns3tcp/response-vectors/ns3tcp-loss-NewReno3-response-vectors.pcap index e125b187c0381a3c63000e1d6c4ed308a8964966..e3b7c9d31ce622c088b923845be25668f920a662 100644 GIT binary patch delta 1375 zcmYk*y>HW69EWkY4z7CJ(#ANZ5ZVAWDQ$TvY1%@769!-+RR&(v?G9IEVuRd~%as*Y zxIfF%9grA;X9g3*1QM1v2BgR{LuCE|%M2jFBQ*olN2eK{?>R}c$Jyi8dsEV%YRle~ zlIzo^7}H8TygRMNcW;S5y(9G*Q*!?7;?0@1bPu-0pHX7Xnv&vQxOGrThzSN<}G^n)-u( z4Y^lpiDwt(O{pnEn-{U^AEu8k1~|ZcJ{o0>c^>9)c9B~L1jmV9F60|PY_2J0~}zE&PnPg zsH2Y&rf4luKS>?C7-BNAy2RxjF2AJo7qx=CU1~|j*>=dEB99*Safrq#`c?YqVt@n8 z(OITnrH?*Fn4)!>{_?(E3^^xQSmE(c)5i|>Fvbk+75c06(Oc!qU*XHg1FKD`uNCDE zx@+`T>0^%08TxDV(Z>i=w9e8$vu_te&IuOI(LYNcJJ`b*GqlgqKTjV$?BfuP^W1-( z`=g5i4lqaO0{wOR=wpN_S~dC?c>kLD$L{mr|GoaK*^=-{VS^<#mS6{a7-NR^221KJ zK@a;I4f#^H#i%!Aebbh^_zwnkmTa;Foh_DZvIKpMFhy&dC0i`PE{2$ltZvi4NFRF` zV}|xc`j_aVhkYEPafz2`@Dk`^fCJ3YxlF%7AAO84Me7Rv%k;5}AtqS3%Kfj<#}4)| z9%)~tujr$PeH_o=wPhv!!pon~3F*?}7V7M&# zVSV89yPlq&a|ij;)01Z$k;a`9ZHpJjM~|hj%^HQ%2J%s zWq!6SkI=y{7|hb2rGJq=+KE19F48a3$68UP-?=^Vwpf*zb(i0*BK=GBv4I_o(7Z(d zGJULL8$&cMv;Qj`KRVdLAW=8yU!iZP)X#qLjN6hi$j_0-8oKCVj9s+m$j_6<26iw) zbDsPHd8}g_Lo^o1Up>>o7V7{DSK0m|d9<;KK4uo_FVV*ux{F-@64#Hv(OMdjTgw%B zy+nVRK1OIR(_f*Fb!=mZ#tQw_GaYQP4zRFF{~CR?v57uruF=0vA8Y8MhcR~1y3YPf z>>nH0!3fO~{TuX4+Q8kD|Nmm&O1gx6F>Wx)8W(|1Vt|D;CRt|^w6Tf)dimA5E`4TM z4zPyr(K8ujok7qt8RRB|U;{fCp?Q-*HW&o!*v1fz4f31h(ZLo5iTW1#P4d`8A2VAV z#5MpEex=*%l7x^qm51U6Z;hX eJ^JXPhw&Z{LGch2523cNbJmD#@z<Xr50oTy$c ztzJv2c)rgPvrmhMYuLncUrvHZPTH*V{gzyaXsKZl;|DBR>eq4uU96zr(TwH9K9G^e zF(n)L4eOY)RQT1iuCA``T=dVMC-+mbX(?HcX5=GQacn@zT1*=cZX2={bBvWOLw51| z8$*_@Js(<*RN|HdmX^>UQw(Uij4qbYAJE45OH&eY$N2Kulw0`dw<)jUj(932gM(Q~ zCt`B5;|?}h_o%E)9%T25-C|j3(HKGv{}@gv-Tao#us- zU~NumnVjYwU>?g@!#2i`(zoej5i1yAXomhYeRQ#eKDN+4N`IC}g|TuiQD9-m`vj{YqD068hLe`#Al1`siW3qdGx9 z#s0B?RcxR+&;A$K|9nR7EGQ}CTWn+WB=0|!k?UB*Z46SGr;AFK7RWD>$I_w|zV_t* zAK4GSVV`7>G=rdrb!?(q+;bfZrx*kqXr>uti9s-rWvpQvG8{z5DmGY~EA-FM$2^v?hHZ?WrJtdXMXX?ep;h{4 z=%b4z^s$BZS^AnjdRWIMs#W?~F2X7o0e7&0JvwV#d%s^UYUiI@+SwQRDS^IZyc_1f YAnO>(5BwM4r(a?Dim`OROrJ~s1%z_b?*IS* delta 1409 zcmYk*KWr0c7=UrR-!)aR9ov`7IUzBGa3mxo*nnfekaGrO#Bfpu_avsGs=7{bX)gHkbK(BC(lBB>q*2#M9)jTZzQu?-`R@xi@d_ ze^K85je53_m7j9A{{Q^?t!>1SCDwVW=mu!T*XN5C$|IKoC=m+GXgibW-# zPde(i8%lQZ$3K)5j6***9Eo&YLWA8Wbup)G`3yY_(4Vr^&$q|q^^~JN`EpEdnvQ5w zd3k8o)t}CL@`Aa=e4|i5a0g@NJ#3itr)}BB&a|!G?~cpvw4=s<8JEHg-2(4w##Y~c zb4(sHThsK9(?{<}AB`D~X0|4GW=wJM5%%`ytfn6Rla?2=x4t`WN^`CzFR_dJUoG!u z9Tm@&^AWQAzDS&ILR95VSqkYJZFTQiQf|&W(r50? za||ar25e#T6vu#FjB#{ib%FjoeH`KdE2rq6<_cjOBMi}6pl{Jf4+HekI8FZyd!UPb z?4f4S#}+mh5A9;iJi^8qo_~oxc5sLTtSr($OCQ@9VTjfe{bl;-VSqjwXX&rdM;H6p zJ1{SQt#JIyT!V9Ud4M|@;~q9v^0K~KmuqmONjFhpyW{(1W7VSqjw zYxGO>(JgTe*0=^ozQV2Z+<|gUe!woi#1U?mOsQVr`Aa-M4omv6+xOr8oJuOR{#s2^) Cq}}lV diff --git a/src/test/ns3tcp/response-vectors/ns3tcp-loss-Tahoe4-response-vectors.pcap b/src/test/ns3tcp/response-vectors/ns3tcp-loss-Tahoe4-response-vectors.pcap index 53c8df43eaac32e2e43d3e8cb06140112c93403d..aa636f82ff57b8253ad51bfa83c533f99da7c85d 100644 GIT binary patch literal 17492 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 MbJDA&%smbM0TuKYb^rhX