almalinux/pungi
14
1
Fork 0
Code Issues Pull Requests Releases Activity

Regenerate test fixture repo

Browse Source 
Make dummy-bash -> dummy-glibc dependency require archful. This avoids
potential race condition where order of dependency processing can result in
different packages being pulled in. The tests where this could happen are
updated.

Make dummy-glibc-debuginfo depend on dummy-glibc-debuginfo-common.

The filenames for the repo no longer include hash, and sqlite databases are not
generated.

Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
This commit is contained in:
Lubomír Sedlář 2019-09-27 07:01:18 -04:00
parent 8ab7d9f7ba
commit ff526d1dd2
17 changed files with 45 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/data/specs/build.sh
View File

@ -58,7 +58,7 @@ rpmbuild --quiet --target=$target -bb --nodeps --define "_srcrpmdir $DIR/../repo
# create main repo # create main repo
echo "Creating main repository" echo "Creating main repository"
createrepo_c --quiet --update --groupfile $DIR/../dummy-comps.xml $DIR/../repo createrepo_c --quiet --update --groupfile $DIR/../dummy-comps.xml $DIR/../repo --no-database --simple-md-filenames
# create lookaside repo for krb5 # create lookaside repo for krb5

2
tests/data/specs/dummy-bash.spec
View File

@ -3,7 +3,7 @@ Version: 4.2.37
Release: 6 Release: 6
License: LGPLv2 License: LGPLv2
Summary: A dummy bash package Summary: A dummy bash package
Requires: dummy-glibc Requires: dummy-glibc%{?_isa}
%if %__isa_bits == 32 %if %__isa_bits == 32
Requires: libpthread.so.0(GLIBC_2.0) Requires: libpthread.so.0(GLIBC_2.0)
%else %else

1
tests/data/specs/dummy-glibc.spec
View File

@ -31,6 +31,7 @@ A dummy nscd package
%package debuginfo %package debuginfo
Summary: A dummy glibc-debuginfo package Summary: A dummy glibc-debuginfo package
Group: Development/Debug Group: Development/Debug
Requires: %{name}-debuginfo-common%{?_isa} = %{version}-%{release}
%description debuginfo %description debuginfo
A dummy glibc-debuginfo package A dummy glibc-debuginfo package

BIN
tests/fixtures/repos/repo/repodata/2f8cc4b5cf852eca9838393db012ad4e494ccea437ffbbbf95e110a388e15f35-dummy-comps.xml.gz vendored
View File

Binary file not shown.

BIN
tests/fixtures/repos/repo/repodata/44d7c373789c0ab11978a23af58d5a5b25b7a6c6efb07cef06aebce015b0be44-primary.sqlite.bz2 vendored
View File

Binary file not shown.

BIN
tests/fixtures/repos/repo/repodata/9437426ee80321bd23920f8385fb60f86ad926c0d40153adfec217209dfccf04-filelists.xml.gz vendored
View File

Binary file not shown.

BIN
tests/fixtures/repos/repo/repodata/b86f54540738fac2e1cdf66ee218a7be34f33446dbd09c20d538f61bceacb47b-filelists.sqlite.bz2 vendored
View File

Binary file not shown.

BIN
tests/fixtures/repos/repo/repodata/d98c8266ea319fb88cd516de4c2916e49d5d2e310fc6c236522ea6c250a8a1fd-other.sqlite.bz2 vendored
View File

Binary file not shown.

15
tests/fixtures/repos/repo/repodata/cd2e022a3f1163bed5dd38328a2c0bd7a8db1589a9e67b25c6341941914e1077-dummy-comps.xml → tests/fixtures/repos/repo/repodata/dummy-comps.xml vendored
View File

@ -33,8 +33,8 @@
<default>false</default> <default>false</default>
<uservisible>true</uservisible> <uservisible>true</uservisible>
<packagelist> <packagelist>
<packagereq type="optional">dummy-elinks</packagereq> <packagereq type="optional" variant="Server">dummy-elinks</packagereq>
<packagereq type="optional">dummy-tftp</packagereq> <packagereq type="optional" variant="Client">dummy-tftp</packagereq>
</packagelist> </packagelist>
</group> </group>
@ -135,6 +135,17 @@
</grouplist> </grouplist>
</environment> </environment>
<environment>
<id>foobar</id>
<name>Foo Bar</name>
<description>Referencing a group from parent variant</description>
<display_order>10</display_order>
<grouplist>
<groupid>resilient-storage</groupid>
<groupid>text-internet</groupid>
</grouplist>
</environment>
<!-- LANGPACKS --> <!-- LANGPACKS -->
<langpacks> <langpacks>

BIN
tests/fixtures/repos/repo/repodata/dummy-comps.xml.gz vendored Normal file
View File

Binary file not shown.

BIN
tests/fixtures/repos/repo/repodata/e91bb0df9fa5fa4eb0c06612415333156fff862fb654cc8d3aaf2ba1cee7675d-other.xml.gz vendored
View File

Binary file not shown.

BIN
tests/fixtures/repos/repo/repodata/ea136c790c7e3994e27d50064c8ca6837328eed70dc01707d0bdd41f06757f36-primary.xml.gz vendored
View File

Binary file not shown.

BIN
tests/fixtures/repos/repo/repodata/filelists.xml.gz vendored Normal file
View File

Binary file not shown.

BIN
tests/fixtures/repos/repo/repodata/other.xml.gz vendored Normal file
View File

Binary file not shown.

BIN
tests/fixtures/repos/repo/repodata/primary.xml.gz vendored Normal file
View File

Binary file not shown.

85
tests/fixtures/repos/repo/repodata/repomd.xml vendored
View File

@ -1,69 +1,42 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<repomd xmlns="http://linux.duke.edu/metadata/repo" xmlns:rpm="http://linux.duke.edu/metadata/rpm"> <repomd xmlns="http://linux.duke.edu/metadata/repo" xmlns:rpm="http://linux.duke.edu/metadata/rpm">
<revision>1501137081</revision> <revision>1569587868</revision>
<data type="primary"> <data type="primary">
<checksum type="sha256">ea136c790c7e3994e27d50064c8ca6837328eed70dc01707d0bdd41f06757f36</checksum> <checksum type="sha256">933f043ad907d8bedcc2a8c9d8804a31488d596137e73edec162f264b56c0138</checksum>
<open-checksum type="sha256">8cff34417dca37ff1d5a64f42c97558d4244d9e14a573b3b7de1d2fa58b87156</open-checksum> <open-checksum type="sha256">2ae675b9c37655d11524939799db41cf2cb9cb061b6db002f8af8994d56ec33a</open-checksum>
<location href="repodata/ea136c790c7e3994e27d50064c8ca6837328eed70dc01707d0bdd41f06757f36-primary.xml.gz"/> <location href="repodata/primary.xml.gz"/>
<timestamp>1501137081</timestamp> <timestamp>1569587868</timestamp>
<size>36232</size> <size>34022</size>
<open-size>486734</open-size> <open-size>473736</open-size>
</data> </data>
<data type="filelists"> <data type="filelists">
<checksum type="sha256">9437426ee80321bd23920f8385fb60f86ad926c0d40153adfec217209dfccf04</checksum> <checksum type="sha256">bfbc10c5f8424b18d845d273971a9ff329f080a1e65153460ab6d60d57fc8008</checksum>
<open-checksum type="sha256">0a6ebdff378b4d809a0026e371beccb0a02104b10ce3370debf23011ed10ce90</open-checksum> <open-checksum type="sha256">5b7e9479eb02344eaba0f759a139adce9b4c8e1da3364ccc50a1c471f4d40f5c</open-checksum>
<location href="repodata/9437426ee80321bd23920f8385fb60f86ad926c0d40153adfec217209dfccf04-filelists.xml.gz"/> <location href="repodata/filelists.xml.gz"/>
<timestamp>1501137081</timestamp> <timestamp>1569587868</timestamp>
<size>21790</size> <size>21107</size>
<open-size>81227</open-size> <open-size>78814</open-size>
</data> </data>
<data type="other"> <data type="other">
<checksum type="sha256">e91bb0df9fa5fa4eb0c06612415333156fff862fb654cc8d3aaf2ba1cee7675d</checksum> <checksum type="sha256">f56a62c25d02d098d02e7858ba3852332d9953cb3ab08a50a1bd31fc4b643289</checksum>
<open-checksum type="sha256">ce4542166fa099eff840191be53cca08f248b540e979d58c228ce2cef4bf9902</open-checksum> <open-checksum type="sha256">38dad9e1f2e953a45d89727510032833e15d893f0b567cf02db87099007e7946</open-checksum>
<location href="repodata/e91bb0df9fa5fa4eb0c06612415333156fff862fb654cc8d3aaf2ba1cee7675d-other.xml.gz"/> <location href="repodata/other.xml.gz"/>
<timestamp>1501137081</timestamp> <timestamp>1569587868</timestamp>
<size>21852</size> <size>21128</size>
<open-size>130245</open-size> <open-size>126281</open-size>
</data>
<data type="primary_db">
<checksum type="sha256">44d7c373789c0ab11978a23af58d5a5b25b7a6c6efb07cef06aebce015b0be44</checksum>
<open-checksum type="sha256">578f192bcc52487ab45b853e3c92bffc78bb199208371eadd34645360c38cef2</open-checksum>
<location href="repodata/44d7c373789c0ab11978a23af58d5a5b25b7a6c6efb07cef06aebce015b0be44-primary.sqlite.bz2"/>
<timestamp>1501137081</timestamp>
<size>63016</size>
<open-size>389120</open-size>
<database_version>10</database_version>
</data>
<data type="filelists_db">
<checksum type="sha256">b86f54540738fac2e1cdf66ee218a7be34f33446dbd09c20d538f61bceacb47b</checksum>
<open-checksum type="sha256">b8ab6e3689cce6a8391293a11e037da6bf7b5face21ed64d80877709800352ef</open-checksum>
<location href="repodata/b86f54540738fac2e1cdf66ee218a7be34f33446dbd09c20d538f61bceacb47b-filelists.sqlite.bz2"/>
<timestamp>1501137081</timestamp>
<size>28094</size>
<open-size>94208</open-size>
<database_version>10</database_version>
</data>
<data type="other_db">
<checksum type="sha256">d98c8266ea319fb88cd516de4c2916e49d5d2e310fc6c236522ea6c250a8a1fd</checksum>
<open-checksum type="sha256">bb732dae3bb6147fe01c433e584260efea83e187ed924f992bcd9eb9d02279c2</open-checksum>
<location href="repodata/d98c8266ea319fb88cd516de4c2916e49d5d2e310fc6c236522ea6c250a8a1fd-other.sqlite.bz2"/>
<timestamp>1501137081</timestamp>
<size>32564</size>
<open-size>131072</open-size>
<database_version>10</database_version>
</data> </data>
<data type="group"> <data type="group">
<checksum type="sha256">cd2e022a3f1163bed5dd38328a2c0bd7a8db1589a9e67b25c6341941914e1077</checksum> <checksum type="sha256">f51042fe649151ec95b8d0ffc1565f95911b1870b8a8e03dc29ebce8bd767623</checksum>
<location href="repodata/cd2e022a3f1163bed5dd38328a2c0bd7a8db1589a9e67b25c6341941914e1077-dummy-comps.xml"/> <location href="repodata/dummy-comps.xml"/>
<timestamp>1501137081</timestamp> <timestamp>1569587868</timestamp>
<size>5178</size> <size>5515</size>
</data> </data>
<data type="group_gz"> <data type="group_gz">
<checksum type="sha256">2f8cc4b5cf852eca9838393db012ad4e494ccea437ffbbbf95e110a388e15f35</checksum> <checksum type="sha256">ae005c66a85badb84fa7a43f136a56e4f142948b485c10ae5d369a6129e3d058</checksum>
<open-checksum type="sha256">cd2e022a3f1163bed5dd38328a2c0bd7a8db1589a9e67b25c6341941914e1077</open-checksum> <open-checksum type="sha256">f51042fe649151ec95b8d0ffc1565f95911b1870b8a8e03dc29ebce8bd767623</open-checksum>
<location href="repodata/2f8cc4b5cf852eca9838393db012ad4e494ccea437ffbbbf95e110a388e15f35-dummy-comps.xml.gz"/> <location href="repodata/dummy-comps.xml.gz"/>
<timestamp>1501137081</timestamp> <timestamp>1569587868</timestamp>
<size>1244</size> <size>1311</size>
<open-size>5178</open-size> <open-size>5515</open-size>
</data> </data>
</repomd> </repomd>

2
tests/test_gather.py
View File

@ -213,7 +213,6 @@ class DepsolvingBase(object):
"dummy-bash-4.2.37-6.i686.rpm", "dummy-bash-4.2.37-6.i686.rpm",
"dummy-filesystem-4.2.37-6.x86_64.rpm", "dummy-filesystem-4.2.37-6.x86_64.rpm",
"dummy-glibc-2.14-5.i686.rpm", "dummy-glibc-2.14-5.i686.rpm",
"dummy-glibc-2.14-5.x86_64.rpm",
"dummy-glibc-common-2.14-5.x86_64.rpm", "dummy-glibc-common-2.14-5.x86_64.rpm",
]) ])
self.assertItemsEqual(pkg_map["srpm"], [ self.assertItemsEqual(pkg_map["srpm"], [
@ -970,7 +969,6 @@ class DepsolvingBase(object):
"dummy-bash-4.2.37-6.i686.rpm", "dummy-bash-4.2.37-6.i686.rpm",
"dummy-filesystem-4.2.37-6.x86_64.rpm", "dummy-filesystem-4.2.37-6.x86_64.rpm",
"dummy-glibc-2.14-5.i686.rpm", "dummy-glibc-2.14-5.i686.rpm",
"dummy-glibc-2.14-5.x86_64.rpm",
"dummy-glibc-common-2.14-5.x86_64.rpm", "dummy-glibc-common-2.14-5.x86_64.rpm",
]) ])
self.assertItemsEqual(pkg_map["srpm"], [ self.assertItemsEqual(pkg_map["srpm"], [