From ed0a8249b1da3a6417e90cd92f24bf61f0b982b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= <lsedlar@redhat.com>
Date: Fri, 23 Jun 2017 12:03:29 +0200
Subject: [PATCH] gather: Add tests for excluding packages from lookaside
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
---
 ...813277453f7819447ec52ad1e-filelists.xml.gz | Bin 0 -> 338 bytes
 ...73edabac546c35af84b7bcec85be3-other.xml.gz | Bin 0 -> 435 bytes
 ...6293e2a1dde8274cf3028dce692-primary.xml.gz | Bin 0 -> 778 bytes
 .../cockpit-lookaside/repodata/repomd.xml     |  28 +++++++++++
 ...751a3f47b84031eea266ea585b3-primary.xml.gz | Bin 0 -> 775 bytes
 ...da33c0022f9d872899705002c-filelists.xml.gz | Bin 0 -> 337 bytes
 ...965bdffc501b89d9f0c806f6af1af-other.xml.gz | Bin 0 -> 432 bytes
 .../repos/cockpit/repodata/repomd.xml         |  28 +++++++++++
 tests/test_gather.py                          |  46 ++++++++++++++++++
 9 files changed, 102 insertions(+)
 create mode 100644 tests/fixtures/repos/cockpit-lookaside/repodata/446ee5f2b8296322faf8b19259b26350655f77e813277453f7819447ec52ad1e-filelists.xml.gz
 create mode 100644 tests/fixtures/repos/cockpit-lookaside/repodata/4f8f323b48f989035622217a41c205b450073edabac546c35af84b7bcec85be3-other.xml.gz
 create mode 100644 tests/fixtures/repos/cockpit-lookaside/repodata/d07c8273d3954bd3257f6351f3b23fed0e3896293e2a1dde8274cf3028dce692-primary.xml.gz
 create mode 100644 tests/fixtures/repos/cockpit-lookaside/repodata/repomd.xml
 create mode 100644 tests/fixtures/repos/cockpit/repodata/54cbdff4c313405103d8b21bf7e66cb1a7eba751a3f47b84031eea266ea585b3-primary.xml.gz
 create mode 100644 tests/fixtures/repos/cockpit/repodata/ba23b0026102b0510915964775cb2b1679591a4da33c0022f9d872899705002c-filelists.xml.gz
 create mode 100644 tests/fixtures/repos/cockpit/repodata/e08e47cf6ecc4d6654cc0d462b42a3c6b20965bdffc501b89d9f0c806f6af1af-other.xml.gz
 create mode 100644 tests/fixtures/repos/cockpit/repodata/repomd.xml

diff --git a/tests/fixtures/repos/cockpit-lookaside/repodata/446ee5f2b8296322faf8b19259b26350655f77e813277453f7819447ec52ad1e-filelists.xml.gz b/tests/fixtures/repos/cockpit-lookaside/repodata/446ee5f2b8296322faf8b19259b26350655f77e813277453f7819447ec52ad1e-filelists.xml.gz
new file mode 100644
index 0000000000000000000000000000000000000000..c1468a7d3fbf763b30208b1a423c2b7afbd278ab
GIT binary patch
literal 338
zcmV-Y0j>TYiwFP!000001GUmiPQx$|2H-uXu)J?Gek8F`13OLt2N=(c+o*Y|NfF#0
zBUP|~C9KAevHks$507u-pkC#&_Vd(fvj?qYqM7^Y*y)$&r(MvG4|j*$4>I)YwyM%U
zt(`t?+j3u3LqA>L_Iy3dUiey#vLWM!)mOh(3(^^nQqDMCZn{m?az6Il>Cnd32Moak
z=4i=yXp_sBn;hBr))N3WG1X3pa*R1z7Jxbd2^g2PnsAg(^K~5GcQn&^={K$LLZ?no
z^JguuDs{MJRI<#UTP0^%DT!Us>LNoK>8kLmoA0NzMkWZR!B7jKbDS~d;GH83Y#ll0
zld(WdzBSnZ7G45jmusY)<yYyBOO?yNfSn1}H3+sXOba<!Pfa3h8sY#Ry+Eh~L9A14
kITd2e1UY#_jWfyp4qo5aO~$_ge}9vQ4>M|wM2P|b0Hk}KzW@LL

literal 0
HcmV?d00001

diff --git a/tests/fixtures/repos/cockpit-lookaside/repodata/4f8f323b48f989035622217a41c205b450073edabac546c35af84b7bcec85be3-other.xml.gz b/tests/fixtures/repos/cockpit-lookaside/repodata/4f8f323b48f989035622217a41c205b450073edabac546c35af84b7bcec85be3-other.xml.gz
new file mode 100644
index 0000000000000000000000000000000000000000..2b999387b2bd1515e820f84da805632b8fbb1bdc
GIT binary patch
literal 435
zcmV;k0ZjfMiwFP!000001KpF)ZrmUc#_xR!M5Wxk27_(rt~WWfIrY}&0fu3)t@WRk
zjib%m7e}jHnkUGG8HP{uF+arV@iq?Zm6o-ir-sXe;EX1meLuAgfBE~I8UA?wcA8^H
zi-!m->8G{fU5wWsc|P>hc02g(LI?6&K2n5TmA~sby8>RIrKDFpb-8cZ_0smf;ik5=
zHeif2-rEAD7PV6WLKUo+y4ENJRMwS>5QDYB7M_GCoj?*&1<ocIso{Pb$F~e;yj=Up
z87$Z}e46)|Tp2sv=VNr8_oFmps-$U^;cTHHWjucuVh2-8!`w31VmBwv@6FBQ!}r^-
zpT~v$AwTT7Jf>Ba_Q)QFcpTPLhUIA?-$6WJ(zo%*GM4&hlCuOPT~cam3TX==_&H<G
z{j$d0n_#6={^6S-<#$T|^D4okFtP$u5`t1bfD1+|g<yQ4P$}(XA<(0)Wsm|ABqzwL
zPy&WPpYqCliu+rAS!_z0LRBD&I>9PLFonj-AygH5BQ$6drZgyQ>B_>p1j+^!!D)$=
dl1_b&ZGBrKjb8~{{_)Ar{{U!Dj;$92007^6)ph^?

literal 0
HcmV?d00001

diff --git a/tests/fixtures/repos/cockpit-lookaside/repodata/d07c8273d3954bd3257f6351f3b23fed0e3896293e2a1dde8274cf3028dce692-primary.xml.gz b/tests/fixtures/repos/cockpit-lookaside/repodata/d07c8273d3954bd3257f6351f3b23fed0e3896293e2a1dde8274cf3028dce692-primary.xml.gz
new file mode 100644
index 0000000000000000000000000000000000000000..b5ca15f0a2dd7e0d230d06dad802a0f5933f4361
GIT binary patch
literal 778
zcmV+l1NHnLiwFP!000001MOB#bDJ;_z2{eGbhnWZV37ebok`nE4(+r#^eCj2tubE}
z;HmrTD;XRo=~ptIHa+xWNz2<^-mc!_?CMKhp&i)Xv`vobl3)alY?W!&Ille)X2J1Q
zago(92qgxA9K7jsycve>G6*Wuj9->&+`<yn7#vZ7Z0ovh@Pxj!UHw}Rhry^5ax2#0
z;xp`$&PO!tJIJv|6c-3(ji{keV_okTvX$G;3|Vln`G>;FP0_S|$%4bdTW5j@x>jy-
z>_|F`qsur(7Am*H!2u{YAh-Qk&pG>z2;;=P*miAHjz7KrfD67#R}mMSQ?67RN*a+>
z$+XakP8E$-kt9SUX&Ez+Qm3g-Lj{DyC6PcV(^+s#a>(e`TG)N@3LPk+nbNTqS#Sh+
zu!3G%(+!Tx&mHcAywm)^7Flq&_4d(L&g6gnX)rY)Z7Ro_Mkx;|p_F1&j;2y46Crb<
zdh->IDRUh2FvQ3-{UE9e)S<$@_-5zBh0*L(wNm)kLK_P@#}9hAaLriI<<z>RZ}#M)
zTU(34Z{5L}FDoOV>7lrJ`|f5JX2E^i3AKYpwVv|5!|CbTwqsY^Hhl-uXaj1(P39Bq
zKz`HqLs9jhDq$zs$$WzL?Pw*qUGXDUy_KHQ<bHyl+&3T;*o761yYH@wcF1uQxxzU$
zx^l)Vl1%lO@ttjV#x;5}%|>VjyGLFMk7|pNuEg5O>h*j4TMf8i!Q&KJaBRcf9eR#F
z7s{<*|Ef%5p(Non5j+Md7*kr5nn#RD!Bxm4V^K*%B9)9*R8u0HHcJAE=~zgu;b}6R
znLS&r-}$|WXjlAP(M~k}YxkGhO~Ny@JD2!u3D0>fd>)N`a`JxP4^TghdOyUugJFvQ
zR|f;5JY<O=;mVDJkZ2x8GAX4<5~(<eL<EG#T#_^{<4~1u6r@@bT}D(UjF#+)gJEL!
z{K4?p??nbf9GyEDCK@j=7_MOlRom6>P6yXej_ZGZJh)4I#(0<&`e(lIcmL0eZ%FK^
I+bIkH0F|qN!vFvP

literal 0
HcmV?d00001

diff --git a/tests/fixtures/repos/cockpit-lookaside/repodata/repomd.xml b/tests/fixtures/repos/cockpit-lookaside/repodata/repomd.xml
new file mode 100644
index 00000000..a384a517
--- /dev/null
+++ b/tests/fixtures/repos/cockpit-lookaside/repodata/repomd.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<repomd xmlns="http://linux.duke.edu/metadata/repo" xmlns:rpm="http://linux.duke.edu/metadata/rpm">
+  <revision>1498210122</revision>
+  <data type="primary">
+    <checksum type="sha256">d07c8273d3954bd3257f6351f3b23fed0e3896293e2a1dde8274cf3028dce692</checksum>
+    <open-checksum type="sha256">ecba59d2b4924b1c13d4b718fef81b337e97b91e955e7c8ad41b16ba5d7c2c5f</open-checksum>
+    <location href="repodata/d07c8273d3954bd3257f6351f3b23fed0e3896293e2a1dde8274cf3028dce692-primary.xml.gz"/>
+    <timestamp>1498210121</timestamp>
+    <size>778</size>
+    <open-size>3113</open-size>
+  </data>
+  <data type="filelists">
+    <checksum type="sha256">446ee5f2b8296322faf8b19259b26350655f77e813277453f7819447ec52ad1e</checksum>
+    <open-checksum type="sha256">ceff2801221c629a8dbc7ed069c0aa9427c5b195afe49b4170b56d22eb0ab6e6</open-checksum>
+    <location href="repodata/446ee5f2b8296322faf8b19259b26350655f77e813277453f7819447ec52ad1e-filelists.xml.gz"/>
+    <timestamp>1498210121</timestamp>
+    <size>338</size>
+    <open-size>649</open-size>
+  </data>
+  <data type="other">
+    <checksum type="sha256">4f8f323b48f989035622217a41c205b450073edabac546c35af84b7bcec85be3</checksum>
+    <open-checksum type="sha256">16d5ac89d35aaa823cc080d8aa413cf9ce598484f415e027f1f0fed3c1ab6c33</open-checksum>
+    <location href="repodata/4f8f323b48f989035622217a41c205b450073edabac546c35af84b7bcec85be3-other.xml.gz"/>
+    <timestamp>1498210121</timestamp>
+    <size>435</size>
+    <open-size>1047</open-size>
+  </data>
+</repomd>
diff --git a/tests/fixtures/repos/cockpit/repodata/54cbdff4c313405103d8b21bf7e66cb1a7eba751a3f47b84031eea266ea585b3-primary.xml.gz b/tests/fixtures/repos/cockpit/repodata/54cbdff4c313405103d8b21bf7e66cb1a7eba751a3f47b84031eea266ea585b3-primary.xml.gz
new file mode 100644
index 0000000000000000000000000000000000000000..0a33eabe93adcc32d7d6da476e39179f5121d682
GIT binary patch
literal 775
zcmV+i1Ni(OiwFP!000001MOBzZ=5g?zUNmU-*>@0Y!d-drKG*&(5lU$M`I6*wY+Lz
zmF=&uy|5ukA4#-o(nF;cw#VPh@QwWqn_S%1m9qogtF}oIUVF%aMzm5jn-txAdB0-l
zB0EcJ7`WsEcMQDgQ&bK^cka5CYR22O9JjCrIl4!bE84nl8#JNMbyq*>VKB()xY+Uy
znD_xQN#~_A>^n%2MPz4=lQg`BOpbNEUx`+1J2fQk!DctP7G>77c1YaA!dhp74s@+3
zQ)EaQi=i80<Y=hO47mrOC_!xdv7U4GCHEs@UTnKjGDTmnKBFwAz(ib7UvP#6@gt52
zW7H1>01&{0N<WB+7X@4fVUB|sM<S0!2qX_8%o6vQ<dD&fHP`#>opYe%%#@C`NZcd9
zf+h4qt8Oq{e(!J}WS!;>oh9zw)Y?Z~8Iyh5)u3u{3RQtEOU!)iVQT7>kE)W3i5v^n
ztM713nWBjKK5|sk54@^C9x7~$uXZ+^AI?ryE4Y0vr_@lS=)oDT%weqXdOEtbJ?zP+
zXm!m8J2eYqKChI3ribkM!^i8LpSbsJ3u*_AY%S$`i)DAC+p)`Tn!W>}3I%e)P38r5
zAYZoqkX1d%it7osm=|c@j#_}3Wxrz8Yhfu(?hABrFM&(YE6p2o-%S<ukfJa&g)?e2
z<&3CDrh3fyPPaQ{4tg@pMra1TcdQg1)fPEL#WzM)SD(<68Zg1!$0-u`cno)U=q37G
zNi%|eU76+#^U&PeLgLV)%nNCZ88(WgG$s)ifzNs16A!bP%A5g-q40u`NFqEV<mbtB
zX7*yW{^a*2qNVIq(M~k}Yxj@ZCH@K8olAVOgy%dOzKu#hJ9)qF2dE!Ly&vM##xTWy
z)y7Z&4*?hE7Ya_9Pcf#2h#(5QC}cj%DFGHmjF^YuF`=F(NlbFjivZ(1e`aHtn7zC)
zJobB&#t?<4Hin7D8#IPX*g@5HwYk&oCFJAgpKlKVJEc9$3jI4@_`Cn-*$>S)H18=4
F0069Tb_)Oi

literal 0
HcmV?d00001

diff --git a/tests/fixtures/repos/cockpit/repodata/ba23b0026102b0510915964775cb2b1679591a4da33c0022f9d872899705002c-filelists.xml.gz b/tests/fixtures/repos/cockpit/repodata/ba23b0026102b0510915964775cb2b1679591a4da33c0022f9d872899705002c-filelists.xml.gz
new file mode 100644
index 0000000000000000000000000000000000000000..6f95972c6372a333fa82e5e5071c8489f8128c42
GIT binary patch
literal 337
zcmV-X0j~ZZiwFP!000001GSP#Zo@DPMfW|0pnYOdvx+#`^#tt!D2YxCkFcF0xqVe2
zXg685fFM#7hxY*<PPd_FpR}y)G}avUf-@S^l-u!K^N;tpo#&_H%b{s|>f3c&S;-&Q
znqRhUeyys$9j~{2zIL>ye60rBFyn^RPd;ZerVh_kY7{S>9#1xR=Qh_oIPxhpPA2q_
ztTYJLdnZ*QB1>RhmMU0b6lSF(r~oF#kTlt-40z5)9H{2`It=$+no>8n8)vwrOU=jW
z+m@+}9UdAP&C~Z+(ODuzu?Ef->Wjy#f>%BGo{&Zls6mG&gBH#U?E-ix(9Q*GASsEc
zq!r+U%h8h!)Ci?*wn-E%Pf2&VSX%xCxFOU8O*uND^U?vhCK)nH811Ex&XPCA+j1og
j)(Mequu%v@05LuXUhnHh!`}e^uF3HWyym|8i2?us)hC-(

literal 0
HcmV?d00001

diff --git a/tests/fixtures/repos/cockpit/repodata/e08e47cf6ecc4d6654cc0d462b42a3c6b20965bdffc501b89d9f0c806f6af1af-other.xml.gz b/tests/fixtures/repos/cockpit/repodata/e08e47cf6ecc4d6654cc0d462b42a3c6b20965bdffc501b89d9f0c806f6af1af-other.xml.gz
new file mode 100644
index 0000000000000000000000000000000000000000..a2c7091b61bcf454979493a2346013d0c75947d8
GIT binary patch
literal 432
zcmV;h0Z;xPiwFP!000001KpELZrd;rhW9-M!2sFG;)vp_wwx^5th#G^fDt)*z<L-G
zRXDdV6&P9h1ObTQaQI_>%t!F_avKNskCwHcr;5Wta7L4#LqD|@|NG}Hv;5`!?KH=Z
zmVgmi(obu}yBM$E^L*&1?RE&;g$@+9e58oGD*w=Pc13@|mXcob)a8C;*Gt=niaSHr
zyT%kAEqGlh1Z}M;q$eUxpiL;G(?UrMvaCTmP`-A)Bwb4dma_>*s(9GO@jdgizg+vs
z87{u7_%!c(a%JpvpO4XX-mlV(sgkBGfwP5%l=1vS=sTQR8s?Va7P~oVer@$UK0n=l
z{x~k|H-%x(;g}*QcVy2)JPvCr<MO&t=rA69(zo%*G6vFS$sqxu-OSknTp<KMXY8$C
z*0_5Uu5`*jeG{boPU!)!+5(oTQ4^pP#){H7u#nIh<Fo=V3q)CH0oIvNThfjiAxj;!
z7m4UYURg-{{#IWWTSHh9G-;I{jV%m-X}lsOg(_`fYop03WpxT3oi;)Q?Q|`KB7nMn
ajBR~iBaL4PTmJdU&;J2j-E00A1ONbqLeH51

literal 0
HcmV?d00001

diff --git a/tests/fixtures/repos/cockpit/repodata/repomd.xml b/tests/fixtures/repos/cockpit/repodata/repomd.xml
new file mode 100644
index 00000000..d4e4096d
--- /dev/null
+++ b/tests/fixtures/repos/cockpit/repodata/repomd.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<repomd xmlns="http://linux.duke.edu/metadata/repo" xmlns:rpm="http://linux.duke.edu/metadata/rpm">
+  <revision>1498210174</revision>
+  <data type="primary">
+    <checksum type="sha256">54cbdff4c313405103d8b21bf7e66cb1a7eba751a3f47b84031eea266ea585b3</checksum>
+    <open-checksum type="sha256">96a76c77a8294050bb304522166e356e814e9425d45dea7bf247c2db631c199e</open-checksum>
+    <location href="repodata/54cbdff4c313405103d8b21bf7e66cb1a7eba751a3f47b84031eea266ea585b3-primary.xml.gz"/>
+    <timestamp>1498210174</timestamp>
+    <size>775</size>
+    <open-size>3113</open-size>
+  </data>
+  <data type="filelists">
+    <checksum type="sha256">ba23b0026102b0510915964775cb2b1679591a4da33c0022f9d872899705002c</checksum>
+    <open-checksum type="sha256">7449a1d56e4cd07e8e3ed442d74d29de8d03124577a40158a89599e095b1ad49</open-checksum>
+    <location href="repodata/ba23b0026102b0510915964775cb2b1679591a4da33c0022f9d872899705002c-filelists.xml.gz"/>
+    <timestamp>1498210174</timestamp>
+    <size>337</size>
+    <open-size>649</open-size>
+  </data>
+  <data type="other">
+    <checksum type="sha256">e08e47cf6ecc4d6654cc0d462b42a3c6b20965bdffc501b89d9f0c806f6af1af</checksum>
+    <open-checksum type="sha256">e005b74bf6598da3c4bc05322d5f9cce102ae546903ca80bee9b3abaf95e6c4e</open-checksum>
+    <location href="repodata/e08e47cf6ecc4d6654cc0d462b42a3c6b20965bdffc501b89d9f0c806f6af1af-other.xml.gz"/>
+    <timestamp>1498210174</timestamp>
+    <size>432</size>
+    <open-size>1047</open-size>
+  </data>
+</repomd>
diff --git a/tests/test_gather.py b/tests/test_gather.py
index 80218036..df04a931 100644
--- a/tests/test_gather.py
+++ b/tests/test_gather.py
@@ -646,6 +646,52 @@ class DepsolvingBase(object):
             "Dummy-xulrunner-debuginfo-16.0.1-1.x86_64.rpm",
         ])
 
+    def test_old_dep_in_lookaside_is_not_pulled_in(self):
+        # main repo:
+        #   dummy-cockpit-docker-141-1 depends on dummy-cockpit-system
+        #   dummy-cockpit-system-141-1
+        # lookaside:
+        #   dummy-cockpit-system-138-1
+        #
+        # By default newer version should be pulled in.
+        self.repo = os.path.join(os.path.dirname(__file__), "fixtures/repos/cockpit")
+        self.lookaside = os.path.join(os.path.dirname(__file__),
+                                      "fixtures/repos/cockpit-lookaside")
+        packages = [
+            'dummy-cockpit-docker',
+        ]
+        pkg_map = self.go(packages, None, lookaside=self.lookaside)
+
+        self.assertEqual(self.broken_deps, {})
+        self.assertItemsEqual(pkg_map["rpm"], [
+            "dummy-cockpit-docker-141-1.noarch.rpm",
+            "dummy-cockpit-system-141-1.noarch.rpm",
+        ])
+
+    def test_does_not_exclude_from_lookaside(self):
+        # main repo:
+        #   dummy-cockpit-docker-141-1 depends on dummy-cockpit-system
+        #   dummy-cockpit-system-141-1
+        # lookaside:
+        #   dummy-cockpit-system-138-1
+        #
+        # The -system package is excluded and the dependency should be
+        # satisfied by the older version in lookaside. No broken dependencies
+        # should be reported.
+        self.repo = os.path.join(os.path.dirname(__file__), "fixtures/repos/cockpit")
+        self.lookaside = os.path.join(os.path.dirname(__file__),
+                                      "fixtures/repos/cockpit-lookaside")
+        packages = [
+            'dummy-cockpit-docker',
+            '-dummy-cockpit-system',
+        ]
+        pkg_map = self.go(packages, None, lookaside=self.lookaside)
+
+        self.assertEqual(self.broken_deps, {})
+        self.assertItemsEqual(pkg_map["rpm"], [
+            "dummy-cockpit-docker-141-1.noarch.rpm",
+        ])
+
     def test_firefox_fulltree(self):
         packages = [
             "Dummy-firefox",