From 6da5903639f998e716b17cf471b0f55f2bcd73b7 Mon Sep 17 00:00:00 2001
From: Matthias Koefferlein <matthias@koefferlein.de>
Date: Sun, 22 Jan 2023 17:58:09 +0100
Subject: [PATCH] More robustness in unit tests

---
 .../net_tracer/unit_tests/dbNetTracerTests.cc   |   2 +-
 testdata/net_tracer/t6.oas.gz                   | Bin 315 -> 448 bytes
 testdata/net_tracer/t6_all_nets.oas.gz          | Bin 0 -> 731 bytes
 testdata/net_tracer/t6_all_nets.oas.gz.1        | Bin 935 -> 0 bytes
 testdata/net_tracer/t6_all_nets.oas.gz.2        | Bin 936 -> 0 bytes
 testdata/net_tracer/t6_net.oas.gz               | Bin 461 -> 633 bytes
 6 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 testdata/net_tracer/t6_all_nets.oas.gz
 delete mode 100644 testdata/net_tracer/t6_all_nets.oas.gz.1
 delete mode 100644 testdata/net_tracer/t6_all_nets.oas.gz.2

diff --git a/src/plugins/tools/net_tracer/unit_tests/dbNetTracerTests.cc b/src/plugins/tools/net_tracer/unit_tests/dbNetTracerTests.cc
index 93346fdbc..852560683 100644
--- a/src/plugins/tools/net_tracer/unit_tests/dbNetTracerTests.cc
+++ b/src/plugins/tools/net_tracer/unit_tests/dbNetTracerTests.cc
@@ -340,7 +340,7 @@ TEST(6)
   tc.add (connection ("1-10", "2", "3"));
   tc.add (connection ("3", "4", "5"));
 
-  run_test (_this, file, tc, db::LayerProperties (1, 0), db::Point (-2250, -900), file_au, "IN_B");
+  run_test (_this, file, tc, db::LayerProperties (1, 0), db::Point (-2250, -900), file_au, "A");
 }
 
 TEST(6b)
diff --git a/testdata/net_tracer/t6.oas.gz b/testdata/net_tracer/t6.oas.gz
index 2bcc9d2269d0a7b1d111110d4def47242b952479..c7a709fd57b8c27f21f537d05b7fe9e7b699bf52 100644
GIT binary patch
literal 448
zcmV;x0YCm9iwFP!0000015*ul_4U;CcMSFn=H+5!Hq<j<c)`vnBhJLZBE!!tBhJFl
zpu~{slY7RRtHD5k^+1v11?G<Ff}1-V|D1>pTwVS@n&Va!e^1YYWttnS_)TXXcyQoa
z_T{|oXA<J{mD(2dZJfdO)@JeM*lFkcKCNcX*t+*8GbeM1e*i0sr(e7iE2ASTqZ2QK
zNHrrv6XPb<xtuHcMJlE-{$uXse8MVH$+Up+1mi}|yKEvACm2^T9_5?@6lDIuc!{l%
zYayF(H3KulL=I72M!_!(cNyPs3KpDT`@to0n~7l&(*x!^q9PT~7=JNNWL_f%)OCXK
z1LIQW7BP{EeT<hFZ?Mb|6Pd`emPw@I65|%eH!MJjLe?fWkQ!bl!9R>kgcb^LvvAF2
zW@_O5&d;%sjisNNNw8vrStlP*_%IvCW;V71JO|mB?(=Yo{bpq_Vr67*<hrWxgX@68
zMGfI<CRT<80#h}FD;S^fUo;Y_<hsWEjByFaM*)$F2SB%c5x*<I%;+Q|&cM;a$js;n
qVjN*)1_cd>IfaRd@edPY1*0-!F(U&bL&FFI3=9AgW9j9Y0ssK!z0Z>X

literal 315
zcmV-B0mS|viwFP!000001LciBOF~f`hJWul=br98db?_;+v*au6xGnK(BM!8w)Yu=
z2ro9Mv^WY8EkcS7ML~a@#fadp357$FLr8;zL6j6kMi706p7DKncqdbfONr@ZER{&v
z3Vd#6mYzoFF9LBU5QE^W$rUn0VtFlYGo1nL;*%GwM?<IcI5$exp`$(K;|SN*&T!m^
zk29++$1=pJXpU=-_tBI&RhBj)uZ-|}<ja8yZ?w^~bcRtE?<n$PSGOvx!|%VtI+|#S
zJy)lF^l`wqUA-=vsG%oxtBw;kRGyKSKhCD`0H+Iu(ST4_(!7we5xkV_A*jMz)krxM
z;Htz~)_!x$vJ{a`0@YBobB_CA(7XYjQ@7E9YD90Qw5K}U$IC=Jq|<l2i>mn?V%h%;
N(HH11G+i|U001#Tm#6>$

diff --git a/testdata/net_tracer/t6_all_nets.oas.gz b/testdata/net_tracer/t6_all_nets.oas.gz
new file mode 100644
index 0000000000000000000000000000000000000000..3fdf25758c2151fc0af4cb6ad9570c5bb395d38b
GIT binary patch
literal 731
zcmV<10wnz(iwFpYY0YB*19UcDVQg$)Ze?_HE^lFT08<Ti_4U;CcMSFn=H+5!Hq<j<
zc)`vnBhJLZBE!!tBhJFlpu~{slY7RRtHD5k^+1v11?G<Ff}1-V|D1>pTwVS@n&Va!
ze^1YYWttnS_)TXXcyQoa_T{|oXA<J{mD(2dZJfdO)@JeM*lFkcKCNcX*t+*8Gbf9m
zYe+CRlZrX>3wCA(9vFj{Rn(e^fsyG7(*)+DoKsjuEf|5U156t^@3M(nGBYwQ;eEi|
z$h8p20XmUs2lE=HPR=J_Wly+TnC5b><mY8kVkpWG{&S$J=`H*8gp;wy%;zk+=EKwD
z;~vqs!6sp!vR2l?6JJ_?@_crAW}38U+L<07?-~CM?k3DsWSdlRz^1WMv$%W43Po<^
z%iIgDNQ+JQAg>T}nk6LZBv;VoL(E~xKbvGz-bgKL_6c@j;AP@v6a2!mL};OaV8I8`
zoxGy<FW7+|NLj=5LFz0oHv^Xd$Z-K{m|CP?^6)Y%F&tuC$|(Hj;HHCXCil;t`P!KO
zKI6RR9G~x%J6N*KG`?~%9F?lr|G8KvCHZA~n$Xs?)PxkPgEy4rH(ZUl(lGHQ-*?Vq
zUILFfuX7%={<LVD{td~QOxFx@H~iB+arRv4jNW8p>D#V;6Ds*DO$463Ffj5>h&#L`
zY{G2b6!m~smVi%8{`$rdx7sFZrt)4Edb^v+p>oH%{ePSUwmMvP@Y1?w5c?qN)akPd
zN(>CVjDla7?lQjN6f8Kw_JfO;LGS>Z-~ndAKa3#Xa<g#FWoByN{m##^kd39EnMtr>
zgIOmZQ1~z#$7VLR13U-WnC|m%DKSJ@C#QWZ=H;9wnEoK**r78oIFfwWjpjJ?*!rAV
z<8ZTL!wYS-G{5xo3eN-lR~)c(Yhj3}G*@=9oUyr|lYxoxE(;?AqcUSLV<jU)!w3Tm
N3;@}HoKc(u004e0cX0p!

literal 0
HcmV?d00001

diff --git a/testdata/net_tracer/t6_all_nets.oas.gz.1 b/testdata/net_tracer/t6_all_nets.oas.gz.1
deleted file mode 100644
index 808b5603067c75f86bb0b89330db8724d25fc252..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 935
zcmY!lcJ=kt^>+;R4CduxWH!_@V0gjKC?n3q!6L)YEF;ds&!EJR>XUoMnybM;fb~F;
z;|1o9>4KX(8~>b$4qRRSKbqrK6n{_8gJqf<tN2Z49(ZuzTK46<?Pn6=^p)Bc^=+KN
z_SR<c=GbZH`#!B^&e*#5Co?CDpKC}kH<OAn^9y!n1|ArLmsQl7iGh)60`mc;jhuJc
zL@gMZt^j#QIj69SS~4>-E#ZB@+{m?%P1F+TM5ZTPElhJcSMr0D?O<NR)XDjTm6t_{
zp(sQ6&!MX6A9<H29OT?4AG7G14^NMedqm#`n}mJJT3H8Ad};m3^V#K@Y0{!;XL@|R
zXZ$y~n=n(6ZBoSno5o7b;_ewM6uFfzb1%3eEjHnUyh6-rmXM^ATtSx)F^47pY?4iR
zBeksAC)kC7mx-56@C(Zlp@jm11s_Cr@`~EOU<Z02Wew8@sk6M?3|s;r#|5lmYLR})
z!^^D1aENg!qwt@Dn+~p-+&_EfYh(WVjPsgve7;xiV97Sq_{zm_RH|bC=VG0d<d^Ab
zLR-^P6H=@W-cXj`a5dse!^D?--#L$Y2|VV!&UwuG)1qzqHza2=T{Fnt@K5{1*>j~c
zdXtT%Z@c<UsN}CS5qS2(z{oct?(mkd3A1@q)B{>s0zNVM>l;VhYMZE;%6nPp?QSNA
z${p+W|8Wx7>Tub?OY53J?1QLNr_U-VF);8l3Vva_%lL*<u;2vS4=!E?!2@i9e;7et
z<!0uZ%gofk`<<U-AsdU}2WAEa!7q#xc^ml!D>j&Q@^Q0p9cJU$%*J+r=O7!?eI70)
zh8TzBw2#HSoYMr;A4D8Gbmj#|k`KGl9EToTpEEfQH!DP)1>TDa8!z9SKB0I;x`$1~
pT}!tXhKO2o<&eFc9ozdk8JHL!voJC+Dl--{Rx&a)j4;5!001pFb({bI

diff --git a/testdata/net_tracer/t6_all_nets.oas.gz.2 b/testdata/net_tracer/t6_all_nets.oas.gz.2
deleted file mode 100644
index a7b65f0e9e6fb1d5d3bc8ee1ca3f7134fb01f2fd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 936
zcmY!lcJ=kt^>+;R4CduxWH!_@V0gjKC?n3q!6L)YEF;ds&!EJR>XUoMnybM;fb~F;
z;|1o9>4KX(8~>b$4qRRSKbqrK6n{_8gJqf<tN2Z49(ZuzTK46<?Pn6=^p)Bc^=+KN
z_SR<c=GbZH`#!B^&e*#5Co?CDpKC}kH<OAv^9y!n1|ArLmsQl7iGh)60`mc;jhuJc
zL@gMZt^j#QIj69SS~4>-E#ZB@+{m?%P1F+TM5ZTPElhJcSMr0D?O<NR)XDjTm6t_{
zp(sQ6&!MX6A9<H29OT?4AG7G14^NMedqm#`n}mJJT3H8Ad};m3^V#K@Y0{!;XL@|R
zXZ$y~n=n(6ZBoSno5o7b;_ewM6uFfzb1%3eEjHnUyh6-rmXM^ATtSx)F^47pY?4iR
zBeksAC)kC7mx-56@C(Zlp@jm11s_Cr@`~EOU<Z02Wew8@sk6M?3|s;r#|5lmYLR})
z!^^D1aENgkqwt@Dn+~p-+&_EfYh(WVjPsgve7;xiV97Sq_{zm_RH|bC=VG0d<d^Ab
zLR-^P6H=@W-cXj`a5dse!^D?--#L$Y2|VV!&UwuG)1qzqHza4O8LUsdm9RH#!ff7@
zd#-+JoC_GmE2?H5bbDc7#JVQ&m-dOX=SpYvCL2pj2QXgP)ovrjk)0zkGw7Ou?!|rD
z3?|Haf2PNCB*_I>dUzg{TE-pYUAa@zg@u8aQSb}XUB)+@f(0koesJ+J2p(V-{K7bq
zw~=4)0~-T_;2%bizqy&Y<}x!i@P6m#SjfgASh2yZlaHH)>o6O~W;V71JO|mB?(=Xd
zF~m3|r+qBu<(wv%{vhJqp))TylFl#~&2i|l^*NK{aI-?xS>U~>u<`QE=@W`qq<h#z
p+_iLTVTh<TR}R^0*s;BzlYxox2@4|wqcUSLV<jU)!w3Tm3;=Ceap(X5

diff --git a/testdata/net_tracer/t6_net.oas.gz b/testdata/net_tracer/t6_net.oas.gz
index 19ed31c1c141340d15306cc9b818f09c15688254..10dafc8e888328c71929fdff46116df895aa571c 100644
GIT binary patch
literal 633
zcmV-<0*3t`iwFp;Y0YB*19WY0Uo~Q5V_`63WG-)Ea{yBfcJ=kt^>+;R4CduxWH!_@
zV0gjKC?n3q!6L)YEF;ds&!EJR>XUoMnybM;fb~F;;|1o9>4KX(8~>b$4qRRSKbqrK
z6n{_8gJqf<tN2Z49(ZuzTK46<?Pn6=^p)Bc^=+KN_SR<c=GbZH`#!B^&e*#5Co?Cr
zpKAy!i>F__6Dy-5FVOt|tkaoeCmr-+3KVI3K1Z^2mgI56xeE%Dg^ygh6xzstk$Fqj
zRc)45Nj;%SS&7{l3te@c6j!+Fi8PDt5(wHfHK3)H^;CqXs@TfzUFFlBf13OM&;Omr
zrJd9mSyyC+?zhldV`(2#bLm{}MhW5R9jkOzANWrCd}*oddzFPR;uN&rdolVY#OJ@-
za%B5si4LPRIzqmZmHZmL>MsuccByiEqRG4R^u!xy8S}DCE*0(#I-!;AbadZBcil28
zzD-?P_Vu4vADDl#g7eb;*)k!&yfyuz@9c=0qq>7Lyy|w7t+!fdr4!HTFExhU@7L_<
zRuR?Nc)!Ev@I%fzzip-|+baDH-g;*#ssAaL*>uW4CA_iNBO{(oS1S0`l*3Vc@6;!W
z)fYbJ=IpJ#$z+yr*y-wj%_o0T5AWWTXa2D2&aBlcmv>G(7*;-&`IQXAydup#VtsR7
z={#VaeW*kKUFhEfrU7%$C;y)+Eg*SK!pZT#JmuE#UyBvBo^&j^!J2fps6M7L#Xv`U
z`-y5vjVrAjv!d)}zMi#y#9UeGo7t72y))l)YCJP2vSh>=I2sw57#FZGRxm0v7Bez1
TGBk`Zz`y_i461iiD+2%kmC{ST

literal 461
zcmV;;0W$s{iwFP!0000015*ul_4U;CcMSFn=H+5!Hq<j<c)`wq449eyTtiq{JpJOG
zco{_MnHZii{$l*1xK@jsgR6n}J3q%lHkN*7roTMDSU&Uc9pE|0#&n;DOQdE2;|az)
zQdbqYg^-o?a%Uj%KJqMJMACFpFb3I(JByflq|oj8%Kr(~o)e6#80RRxRYJArFZ(h^
zByOWX5|XB!e6x_P6{%(3$9M_o*pr%Qe&T<JYS#zGOKcrVooIG_Wk=?93jBi`ewC49
zGau7IMjmA6eqcPJ^byUbmpmVkZ4$0$U}pHC{80*KQ71Q318+A66Hw`678aOAJxu2r
zxt4RYfVIu%<~YD}nT6?q4#=LnEc+NAC@w^^W-9M1R1aNZ+`_m(>Zb;(vR;8F$jZci
zvKp~6GB<KvRrtYmK;fc>NKF&l2gVDM=)O41hvExSOGZYf4J>PzE^sa76}4bw+QGbr
zsYQCKh^P%C(;xOVOh=TSYH$l6o3N1k7b8;e^8rn}$O$rQFW)=lC<B_t0y23gvj)^~
zmKRK-0SDm5KjCU&`XB}LKT1qZ<bH&lD&F#_A(?qr@EWoeObsI$FfafB3z)Rx8Uz3U
DB_!1;