Skip to content

Commit e391eb3

Browse files
ffontaineffontaine
authored
fix: improve other_products (#2579)
- Raise an error if one of the other_products is not found in the product list - Do not always append kerberos to all_the_tests (kerberos package_test_data will be provided by #2509) - Drop gcc, glibc, rust, sqlite, zlib, etc. from other_products if needed Signed-off-by: Fabrice Fontaine <[email protected]>
1 parent 611e68b commit e391eb3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+101
-103
lines changed

‎test/test_data/binutils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"package_name": "binutils_2.26.1-1ubuntu1~16.04.8_amd64.deb",
1919
"product": "binutils",
2020
"version": "2.26.1",
21-
"other_products": ["zlib"],
21+
"other_products": [],
2222
},
2323
{
2424
"url": "http://mirror.centos.org/centos/7/os/x86_64/Packages/",

‎test/test_data/bro.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@
1818
"package_name": "bro_2.5-1_amd64.deb",
1919
"product": "bro",
2020
"version": "2.5",
21-
"other_products": ["sqlite"],
21+
"other_products": [],
2222
},
2323
{
2424
"url": "http://ftp.fr.debian.org/debian/pool/main/b/bro/",
2525
"package_name": "bro_2.5.5-1+deb10u1_arm64.deb",
2626
"product": "bro",
2727
"version": "2.5.5",
28-
"other_products": ["sqlite"],
28+
"other_products": [],
2929
},
3030
]

‎test/test_data/clamav.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,27 +17,27 @@
1717
"package_name": "clamav-0.105.1-1-omv4090.aarch64.rpm",
1818
"product": "clamav",
1919
"version": "0.105.1",
20-
"other_products": ["rust", "zlib"],
20+
"other_products": ["rust"],
2121
},
2222
{
2323
"url": "http://rpmfind.net/linux/openmandriva/cooker/repository/x86_64/main/release/",
2424
"package_name": "clamav-0.105.1-1-omv4090.x86_64.rpm",
2525
"product": "clamav",
2626
"version": "0.105.1",
27-
"other_products": ["rust", "zlib"],
27+
"other_products": ["rust"],
2828
},
2929
{
3030
"url": "http://ftp.fr.debian.org/debian/pool/main/c/clamav/",
3131
"package_name": "clamav_0.102.3+dfsg-0~deb9u1_arm64.deb",
3232
"product": "clamav",
3333
"version": "0.102.3",
34-
"other_products": ["rust", "zlib"],
34+
"other_products": [],
3535
},
3636
{
3737
"url": "https://downloads.openwrt.org/releases/22.03.0/packages/x86_64/packages/",
3838
"package_name": "clamav_0.104.2-1_x86_64.ipk",
3939
"product": "clamav",
4040
"version": "0.104.2",
41-
"other_products": ["rust", "zlib"],
41+
"other_products": ["zlib"],
4242
},
4343
]

‎test/test_data/connman.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@
2424
"package_name": "connman_1.33-3+deb9u1_arm64.deb",
2525
"product": "connman",
2626
"version": "1.33",
27-
"other_products": ["glibc"],
27+
"other_products": [],
2828
},
2929
]

‎test/test_data/exim.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,27 +15,27 @@
1515
"package_name": "exim-4.96-3.fc38.aarch64.rpm",
1616
"product": "exim",
1717
"version": "4.96",
18-
"other_products": ["berkeley_db", "openssl", "gnutls"],
18+
"other_products": ["berkeley_db", "openssl"],
1919
},
2020
{
2121
"url": "http://rpmfind.net/linux/fedora-secondary/development/rawhide/Everything/ppc64le/os/Packages/e/",
2222
"package_name": "exim-4.96-3.fc38.ppc64le.rpm",
2323
"product": "exim",
2424
"version": "4.96",
25-
"other_products": ["berkeley_db", "openssl", "gnutls"],
25+
"other_products": ["berkeley_db", "openssl"],
2626
},
2727
{
2828
"url": "http://ftp.de.debian.org/debian/pool/main/e/exim4/",
2929
"package_name": "exim4-daemon-light_4.89-2+deb9u7_arm64.deb",
3030
"product": "exim",
3131
"version": "4.89",
32-
"other_products": ["berkeley_db", "openssl", "gnutls"],
32+
"other_products": ["berkeley_db"],
3333
},
3434
{
3535
"url": "https://downloads.openwrt.org/releases/22.03.0/packages/x86_64/packages/",
3636
"package_name": "exim_4.95-1_x86_64.ipk",
3737
"product": "exim",
3838
"version": "4.95",
39-
"other_products": ["berkeley_db", "openssl", "gnutls"],
39+
"other_products": ["berkeley_db", "gnutls"],
4040
},
4141
]

‎test/test_data/freerdp.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"package_name": "freerdp-2.8.1-2-omv4090.aarch64.rpm",
1212
"product": "freerdp",
1313
"version": "2.8.1",
14-
"other_products": ["gstreamer"],
14+
"other_products": [],
1515
},
1616
{
1717
"url": "http://ftp.fr.debian.org/debian/pool/main/f/freerdp2/",

‎test/test_data/gpgme.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,6 @@
3232
"package_name": "gpgme-1.13.1-lp152.2.1.aarch64.rpm",
3333
"product": "gpgme",
3434
"version": "1.13.1",
35-
"other_products": ["gcc"],
35+
"other_products": [],
3636
},
3737
]

‎test/test_data/graphicsmagick.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,20 @@
1414
"package_name": "GraphicsMagick-1.3.38-3.fc37.aarch64.rpm",
1515
"product": "graphicsmagick",
1616
"version": "1.3.38",
17-
"other_products": ["libjpeg-turbo"],
17+
"other_products": [],
1818
},
1919
{
2020
"url": "http://rpmfind.net/linux/fedora/linux/development/rawhide/Everything/x86_64/os/Packages/g/",
2121
"package_name": "GraphicsMagick-1.3.38-3.fc37.i686.rpm",
2222
"product": "graphicsmagick",
2323
"version": "1.3.38",
24-
"other_products": ["libjpeg-turbo"],
24+
"other_products": [],
2525
},
2626
{
2727
"url": "https://downloads.openwrt.org/releases/packages-19.07/x86_64/packages/",
2828
"package_name": "graphicsmagick_1.3.35-1_x86_64.ipk",
2929
"product": "graphicsmagick",
3030
"version": "1.3.35",
31-
"other_products": ["libjpeg-turbo"],
31+
"other_products": [],
3232
},
3333
]

‎test/test_data/gupnp.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,6 @@
3232
"package_name": "gupnp-1.0.6-2.el8_4.aarch64.rpm",
3333
"product": "gupnp",
3434
"version": "1.0.6",
35-
"other_products": ["gcc"],
35+
"other_products": [],
3636
},
3737
]

‎test/test_data/haproxy.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,20 +26,20 @@
2626
"package_name": "haproxy-1.5.18-9.el7.x86_64.rpm",
2727
"product": "haproxy",
2828
"version": "1.5.18",
29-
"other_products": ["gcc", "lua"],
29+
"other_products": ["gcc"],
3030
},
3131
{
3232
"url": "http://ftp.br.debian.org/debian/pool/main/h/haproxy/",
3333
"package_name": "haproxy_2.6.6-1_arm64.deb",
3434
"product": "haproxy",
3535
"version": "2.6.6",
36-
"other_products": ["gcc", "lua"],
36+
"other_products": ["lua"],
3737
},
3838
{
3939
"url": "https://downloads.openwrt.org/releases/packages-19.07/x86_64/packages/",
4040
"package_name": "haproxy_2.0.25-1_x86_64.ipk",
4141
"product": "haproxy",
4242
"version": "2.0.25",
43-
"other_products": ["gcc", "lua"],
43+
"other_products": ["lua"],
4444
},
4545
]

‎test/test_data/hdf5.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"package_name": "hdf5-1.10.6.tgz",
2525
"product": "hdf5",
2626
"version": "1.10.6",
27-
"other_products": ["gcc"],
27+
"other_products": [],
2828
},
2929
{
3030
"url": "https://download-ib01.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/x86_64/os/Packages/h/",
@@ -38,6 +38,6 @@
3838
"package_name": "libhdf5-103-1_1.10.6+repack-2_arm64.deb",
3939
"product": "hdf5",
4040
"version": "1.10.6",
41-
"other_products": ["gcc"],
41+
"other_products": [],
4242
},
4343
]

‎test/test_data/icu.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,28 +19,28 @@
1919
"package_name": "icu-68.2-1-omv4002.x86_64.rpm",
2020
"product": "international_components_for_unicode",
2121
"version": "68.2",
22-
"other_products": ["gcc"],
22+
"other_products": [],
2323
},
2424
{
2525
"url": "http://mirror.centos.org/centos/8/BaseOS/aarch64/os/Packages/",
2626
"package_name": "icu-60.3-2.el8_1.aarch64.rpm",
2727
"product": "international_components_for_unicode",
2828
"version": "60.3",
29-
"other_products": ["gcc"],
29+
"other_products": [],
3030
},
3131
{
3232
"url": "http://archive.ubuntu.com/ubuntu/pool/main/i/icu/",
3333
"package_name": "icu-devtools_67.1-4_amd64.deb",
3434
"product": "international_components_for_unicode",
3535
"version": "67.1",
36-
"other_products": ["gcc"],
36+
"other_products": [],
3737
},
3838
{
3939
"url": "https://ftp.netbsd.org/pub/pkgsrc/packages/NetBSD/amd64/8.2/All/",
4040
"package_name": "icu-68.2.tgz",
4141
"product": "international_components_for_unicode",
4242
"version": "68.2",
43-
"other_products": ["gcc"],
43+
"other_products": [],
4444
},
4545
{
4646
"url": "https://rpmfind.net/linux/dag/redhat/el4/en/x86_64/dag/RPMS/",

‎test/test_data/kexectools.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@
2626
"package_name": "kexec-tools_2.0.16-1ubuntu1_amd64.deb",
2727
"product": "kexec-tools",
2828
"version": "2.0.16",
29-
"other_products": ["gcc"],
29+
"other_products": [],
3030
},
3131
]

‎test/test_data/libjpeg.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
"package_name": "libjpeg9_9d-1_amd64.deb",
1111
"product": "libjpeg",
1212
"version": "9d",
13-
"other_products": ["libjpeg-turbo"],
13+
"other_products": [],
1414
},
1515
{
1616
"url": "https://downloads.openwrt.org/releases/packages-19.07/x86_64/packages/",
1717
"package_name": "libjpeg_9c-2_x86_64.ipk",
1818
"product": "libjpeg",
1919
"version": "9c",
20-
"other_products": ["libjpeg-turbo"],
20+
"other_products": [],
2121
},
2222
]

‎test/test_data/libssh.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,6 @@
4747
"package_name": "libssh_0.7.6-4_x86_64.ipk",
4848
"product": "libssh",
4949
"version": "0.7.6",
50-
"other_products": ["openssl"],
50+
"other_products": [],
5151
},
5252
]

‎test/test_data/libtiff.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717
"package_name": "libtiff-4.0.10-4.fc30.i686.rpm",
1818
"product": "libtiff",
1919
"version": "4.0.10",
20-
"other_products": ["libjpeg-turbo"],
20+
"other_products": [],
2121
},
2222
{
2323
"url": "http://mirror.centos.org/centos/7/os/x86_64/Packages/",
2424
"package_name": "libtiff-4.0.3-35.el7.x86_64.rpm",
2525
"product": "libtiff",
2626
"version": "4.0.3",
27-
"other_products": ["libjpeg-turbo"],
27+
"other_products": [],
2828
},
2929
]

‎test/test_data/libvncserver.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,41 +14,41 @@
1414
"package_name": "libvncserver1_0.9.10+dfsg-3ubuntu0.16.04.6_amd64.deb",
1515
"product": "libvncserver",
1616
"version": "0.9.10",
17-
"other_products": ["libjpeg-turbo"],
17+
"other_products": [],
1818
},
1919
{
2020
"url": "http://mirror.centos.org/centos/8/AppStream/x86_64/os/Packages/",
2121
"package_name": "libvncserver-0.9.11-17.el8.x86_64.rpm",
2222
"product": "libvncserver",
2323
"version": "0.9.11",
24-
"other_products": ["libjpeg-turbo"],
24+
"other_products": [],
2525
},
2626
{
2727
"url": "http://archive.ubuntu.com/ubuntu/pool/main/libv/libvncserver/",
2828
"package_name": "libvncserver1_0.9.12+dfsg-9ubuntu0.3_amd64.deb",
2929
"product": "libvncserver",
3030
"version": "0.9.12",
31-
"other_products": ["libjpeg-turbo"],
31+
"other_products": [],
3232
},
3333
{
3434
"url": "http://ftp.br.debian.org/debian/pool/main/libv/libvncserver/",
3535
"package_name": "libvncserver1_0.9.13+dfsg-3_amd64.deb",
3636
"product": "libvncserver",
3737
"version": "0.9.13",
38-
"other_products": ["libjpeg-turbo"],
38+
"other_products": [],
3939
},
4040
{
4141
"url": "https://ftp.netbsd.org/pub/pkgsrc/packages/NetBSD/amd64/9.1/All/",
4242
"package_name": "libVNCServer-0.9.13.tgz",
4343
"product": "libvncserver",
4444
"version": "0.9.13",
45-
"other_products": ["libjpeg-turbo"],
45+
"other_products": [],
4646
},
4747
{
4848
"url": "http://archive.ubuntu.com/ubuntu/pool/main/libv/libvncserver/",
4949
"package_name": "libvncserver1_0.9.13+dfsg-1ubuntu1_amd64.deb",
5050
"product": "libvncserver",
5151
"version": "0.9.13",
52-
"other_products": ["libjpeg-turbo"],
52+
"other_products": [],
5353
},
5454
]

‎test/test_data/minidlna.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,27 +10,27 @@
1010
"package_name": "minidlna-1.3.1-1.4.ppc64.rpm",
1111
"product": "minidlna",
1212
"version": "1.3.1",
13-
"other_products": ["libjpeg-turbo"],
13+
"other_products": [],
1414
},
1515
{
1616
"url": "http://ftp.fr.debian.org/debian/pool/main/m/minidlna/",
1717
"package_name": "minidlna_1.1.2+dfsg-1.1+b3_amd64.deb",
1818
"product": "minidlna",
1919
"version": "1.1.2",
20-
"other_products": ["libjpeg-turbo"],
20+
"other_products": [],
2121
},
2222
{
2323
"url": "http://ftp.fr.debian.org/debian/pool/main/m/minidlna/",
2424
"package_name": "minidlna_1.1.2+dfsg-1.1+b3_armel.deb",
2525
"product": "minidlna",
2626
"version": "1.1.2",
27-
"other_products": ["libjpeg-turbo"],
27+
"other_products": [],
2828
},
2929
{
3030
"url": "https://downloads.openwrt.org/releases/packages-19.07/x86_64/packages/",
3131
"package_name": "minidlna_1.3.0-1_x86_64.ipk",
3232
"product": "minidlna",
3333
"version": "1.3.0",
34-
"other_products": ["libjpeg-turbo"],
34+
"other_products": [],
3535
},
3636
]

‎test/test_data/motion.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,34 +10,34 @@
1010
"package_name": "motion-4.4.0-4.fc37.aarch64.rpm",
1111
"product": "motion",
1212
"version": "4.4.0",
13-
"other_products": ["libjpeg-turbo"],
13+
"other_products": [],
1414
},
1515
{
1616
"url": "http://rpmfind.net/linux/rpmfusion/free/fedora/development/rawhide/Everything/ppc64le/os/Packages/m/",
1717
"package_name": "motion-4.4.0-4.fc37.ppc64le.rpm",
1818
"product": "motion",
1919
"version": "4.4.0",
20-
"other_products": ["libjpeg-turbo"],
20+
"other_products": [],
2121
},
2222
{
2323
"url": "http://ftp.fr.debian.org/debian/pool/main/m/motion/",
2424
"package_name": "motion_3.2.12+git20140228-4+b3_amd64.deb",
2525
"product": "motion",
2626
"version": "3.2.12",
27-
"other_products": ["libjpeg-turbo"],
27+
"other_products": [],
2828
},
2929
{
3030
"url": "http://ftp.fr.debian.org/debian/pool/main/m/motion/",
3131
"package_name": "motion_3.2.12+git20140228-4+b3_armel.deb",
3232
"product": "motion",
3333
"version": "3.2.12",
34-
"other_products": ["libjpeg-turbo"],
34+
"other_products": [],
3535
},
3636
{
3737
"url": "https://downloads.openwrt.org/releases/packages-19.07/x86_64/packages/",
3838
"package_name": "motion_4.2.2-2_x86_64.ipk",
3939
"product": "motion",
4040
"version": "4.2.2",
41-
"other_products": ["libjpeg-turbo"],
41+
"other_products": [],
4242
},
4343
]

0 commit comments

Comments
 (0)