From 95915480a0e24a7c79f61ed57a745fc46202fef2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Roth?= Date: Sun, 11 Aug 2024 11:19:44 +0200 Subject: [PATCH] update tests the fixed handling of provided packages results in snapshots no longer missing provided packages, and also provided packages being added to repos. --- system/t05_snapshot/VerifySnapshot4Test_gold | 3 +- system/t05_snapshot/VerifySnapshot5Test_gold | 3 +- system/t05_snapshot/VerifySnapshot6Test_gold | 12 +---- system/t05_snapshot/VerifySnapshot7Test_gold | 54 +------------------- system/t09_repo/ImportRepo1Test_gold | 9 ++++ system/t09_repo/ImportRepo1Test_repo_show | 11 +++- 6 files changed, 23 insertions(+), 69 deletions(-) diff --git a/system/t05_snapshot/VerifySnapshot4Test_gold b/system/t05_snapshot/VerifySnapshot4Test_gold index 7511132a..3d5499ab 100644 --- a/system/t05_snapshot/VerifySnapshot4Test_gold +++ b/system/t05_snapshot/VerifySnapshot4Test_gold @@ -1,6 +1,6 @@ Loading packages... Verifying... -Missing dependencies (1742): +Missing dependencies (1741): 915resolution [i386] 9fonts [i386] abakus [i386] @@ -691,7 +691,6 @@ Missing dependencies (1742): libdeal.ii-dev [i386] libdigest-cmac-perl [i386] libdrmaa1.0 [i386] - libdspam7-drv (= 3.10.1+dfsg-11) [i386] libdvdcss [i386] libdvdcss-dev [i386] libdvdcss2 [i386] diff --git a/system/t05_snapshot/VerifySnapshot5Test_gold b/system/t05_snapshot/VerifySnapshot5Test_gold index a13ee544..9f14d4f5 100644 --- a/system/t05_snapshot/VerifySnapshot5Test_gold +++ b/system/t05_snapshot/VerifySnapshot5Test_gold @@ -1,6 +1,6 @@ Loading packages... Verifying... -Missing dependencies (1622): +Missing dependencies (1621): 915resolution [i386] 9fonts [i386] abakus [i386] @@ -627,7 +627,6 @@ Missing dependencies (1622): libdeal.ii-dev [i386] libdigest-cmac-perl [i386] libdrmaa1.0 [i386] - libdspam7-drv (= 3.10.1+dfsg-11) [i386] libdvdcss [i386] libdvdcss-dev [i386] libdvdcss2 [i386] diff --git a/system/t05_snapshot/VerifySnapshot6Test_gold b/system/t05_snapshot/VerifySnapshot6Test_gold index af5b29d8..b8574e7d 100644 --- a/system/t05_snapshot/VerifySnapshot6Test_gold +++ b/system/t05_snapshot/VerifySnapshot6Test_gold @@ -1,6 +1,6 @@ Loading packages... Verifying... -Missing dependencies (3797): +Missing dependencies (3787): 915resolution [amd64] 915resolution [i386] 9fonts [amd64] @@ -1213,8 +1213,6 @@ Missing dependencies (3797): jabber [i386] jamnntpd [amd64] jamnntpd [i386] - java-gcj-compat (>= 1.0.69) [amd64] - java-gcj-compat (>= 1.0.69) [i386] jbibtex [amd64] jbibtex [i386] jbibtex-bin [amd64] @@ -1526,8 +1524,6 @@ Missing dependencies (3797): libdigest-cmac-perl [i386] libdrmaa1.0 [amd64] libdrmaa1.0 [i386] - libdspam7-drv (= 3.10.1+dfsg-11) [amd64] - libdspam7-drv (= 3.10.1+dfsg-11) [i386] libdvdcss [amd64] libdvdcss [i386] libdvdcss-dev [amd64] @@ -1606,8 +1602,6 @@ Missing dependencies (3797): libint [i386] libjai-imageio-core-java [amd64] libjai-imageio-core-java [i386] - libjakarta-poi-java (>= 3.2) [amd64] - libjakarta-poi-java (>= 3.2) [i386] libjavascript-perl [amd64] libjavascript-perl [i386] libjdom-java [amd64] @@ -2311,8 +2305,6 @@ Missing dependencies (3797): mummergpu [i386] murasaki [amd64] murasaki [i386] - musixlyr (>= 1.10-4) [amd64] - musixlyr (>= 1.10-4) [i386] musmap [amd64] musmap [i386] mview [amd64] @@ -2958,8 +2950,6 @@ Missing dependencies (3797): python-celementtree [i386] python-clips [amd64] python-clips [i386] - python-ctypes (>= 1.0.1) [amd64] - python-ctypes (>= 1.0.1) [i386] python-dev-all (>= 2.6) [amd64] python-dev-all (>= 2.6) [i386] python-elemental [amd64] diff --git a/system/t05_snapshot/VerifySnapshot7Test_gold b/system/t05_snapshot/VerifySnapshot7Test_gold index b5df842d..85e3ce21 100644 --- a/system/t05_snapshot/VerifySnapshot7Test_gold +++ b/system/t05_snapshot/VerifySnapshot7Test_gold @@ -1,6 +1,6 @@ Loading packages... Verifying... -Missing dependencies (677): +Missing dependencies (625): abrowser [amd64] abrowser [i386] apache [amd64] @@ -96,8 +96,6 @@ Missing dependencies (677): firefox [i386] freebsd-net-tools [amd64] freebsd-net-tools [i386] - fvwm-gnome (>= 1:2.5.13) [amd64] - fvwm-gnome (>= 1:2.5.13) [i386] gcc-mingw-w64 (<< 4.6.3-3+4) [amd64] gcc-mingw-w64 (<< 4.6.3-3+4) [i386] gdm [amd64] @@ -108,8 +106,6 @@ Missing dependencies (677): ghostcript-x (= 9.05~dfsg-6.3+deb7u1) [i386] gij [amd64] gij [i386] - git-core (<= 1:1.7.0.4-1) [amd64] - git-core (<= 1:1.7.0.4-1) [i386] gkrellm2 [amd64] gkrellm2 [i386] gnome-themes-more [amd64] @@ -118,8 +114,6 @@ Missing dependencies (677): gnus [i386] graphicsmagick-im-compat [amd64] graphicsmagick-im-compat [i386] - grep-dctrl (>= 0.11) [amd64] - grep-dctrl (>= 0.11) [i386] gstreamer0.10-plugins-good (<= 0.10.28-2) [amd64] gstreamer0.10-plugins-good (<= 0.10.28-2) [i386] gstreamer0.10-videomixer2 [amd64] @@ -168,8 +162,6 @@ Missing dependencies (677): isdnutils [i386] java-6-runtime [amd64] java-6-runtime [i386] - java-gcj-compat (>= 1.0.77-4) [amd64] - java-gcj-compat (>= 1.0.77-4) [i386] java7-sdk [amd64] java7-sdk [i386] joystick (<< 20051019-6) [amd64] @@ -298,18 +290,8 @@ Missing dependencies (677): libdc1394-dev [i386] libdvdplay0 [amd64] libdvdplay0 [i386] - libemail-mime-creator-perl (>= 1.453) [amd64] - libemail-mime-creator-perl (>= 1.453) [i386] - libemail-mime-modifier-perl (>= 1.441) [amd64] - libemail-mime-modifier-perl (>= 1.441) [i386] libesd-alsa0 (>= 0.2.35) [amd64] libesd-alsa0 (>= 0.2.35) [i386] - libextutils-install-perl (>= 1.52) [amd64] - libextutils-install-perl (>= 1.52) [i386] - libfile-path-perl (>= 2.06) [amd64] - libfile-path-perl (>= 2.06) [i386] - libfile-temp-perl (>= 0.19) [amd64] - libfile-temp-perl (>= 0.19) [i386] libgd-noxpm-perl [amd64] libgd-noxpm-perl [i386] libgd2-dev [amd64] @@ -320,38 +302,20 @@ Missing dependencies (677): libgnomeprint-data [i386] libgtk2.0-dev (<< 2.21) [amd64] libgtk2.0-dev (<< 2.21) [i386] - libhaml-ruby (<< 3.1) [amd64] - libhaml-ruby (<< 3.1) [i386] libicu36-dev [amd64] libicu36-dev [i386] - libio-compress-bzip2-perl (>= 2.008) [amd64] - libio-compress-bzip2-perl (>= 2.008) [i386] - libio-compress-zlib-perl (>= 2.011) [amd64] - libio-compress-zlib-perl (>= 2.011) [i386] - libio-zlib-perl (>= 1.04) [amd64] - libio-zlib-perl (>= 1.04) [i386] libjasper-1.701-dev [amd64] libjasper-1.701-dev [i386] libjibx-java (<< 1.2) [amd64] libjibx-java (<< 1.2) [i386] - liblocale-maketext-simple-perl (>= 0.19) [amd64] - liblocale-maketext-simple-perl (>= 0.19) [i386] libmaildir4 (= 4:4.4.11.1+l10n-3+b1) [amd64] libmaildir4 (= 4:4.4.11.1+l10n-3+b1) [i386] - libmime-perl (>= 5.108) [amd64] - libmime-perl (>= 5.108) [i386] libmodule-metatadata-perl [amd64] libmodule-metatadata-perl [i386] - libmodule-pluggable-perl (>= 3.9) [amd64] - libmodule-pluggable-perl (>= 3.9) [i386] libmotif-dev [amd64] libmotif-dev [i386] - libnet-perl (>= 1.12) [amd64] - libnet-perl (>= 1.12) [i386] libparent (>= 0.223) [amd64] libparent (>= 0.223) [i386] - libparent-perl (>= 0.221) [amd64] - libparent-perl (>= 0.221) [i386] libpng2-dev [amd64] libpng2-dev [i386] libreadline5-dev [amd64] @@ -364,8 +328,6 @@ Missing dependencies (677): libsvn-core-perl [i386] libswt-mozilla-gtk-3-jni [amd64] libswt-mozilla-gtk-3-jni [i386] - libtest-harness-perl (= 3.23-1) [amd64] - libtest-harness-perl (= 3.23-1) [i386] libwww-perl (<< 6) [amd64] libwww-perl (<< 6) [i386] libzephyr4-krb (= 3.0.2-2) [amd64] @@ -460,14 +422,8 @@ Missing dependencies (677): postgresql-client-8.3 [i386] puredata (<< 0.43) [amd64] puredata (<< 0.43) [i386] - pykickstart (>= 0.96) [amd64] - pykickstart (>= 0.96) [i386] python-celementtree [amd64] python-celementtree [i386] - python-codespeak-lib (<< 1.0) [amd64] - python-codespeak-lib (<< 1.0) [i386] - python-ctypes (>= 1.0.0) [amd64] - python-ctypes (>= 1.0.0) [i386] python-elementtree (>= 1.2) [amd64] python-elementtree (>= 1.2) [i386] python-elementtree [amd64] @@ -494,8 +450,6 @@ Missing dependencies (677): python-psycopg (<< 1.1.21) [i386] python-psycopg (>= 1.1.21-14) [amd64] python-psycopg (>= 1.1.21-14) [i386] - python-pynast (>= 1.1) [amd64] - python-pynast (>= 1.1) [i386] python-qt4 (<< 4.7.5) [amd64] python-qt4 (<< 4.7.5) [i386] python-sqlalchemy (<< 0.6.3-2) [amd64] @@ -562,8 +516,6 @@ Missing dependencies (677): urxvt [i386] vidcontrol [amd64] vidcontrol [i386] - w3m-el (>= 1.4.5) [amd64] - w3m-el (>= 1.4.5) [i386] w3m-ssl (>= 0.3) [amd64] w3m-ssl (>= 0.3) [i386] w3mmee (>= 0.3) [amd64] @@ -589,8 +541,6 @@ Missing dependencies (677): wine1.5 [amd64] wine1.5 [i386] wine64-bin (>= 1.4.1-4) [i386] - wish (>= 8.4) [amd64] - wish (>= 8.4) [i386] x-www-browser [amd64] x-www-browser [i386] xcontrib [i386] @@ -626,8 +576,6 @@ Missing dependencies (677): xmessage [i386] xpdf-reader (<< 3.02-2) [amd64] xpdf-reader (<< 3.02-2) [i386] - xpdf-utils (>= 3.02-2) [amd64] - xpdf-utils (>= 3.02-2) [i386] xrandr [amd64] xrandr [i386] xulrunner-1.9 [amd64] diff --git a/system/t09_repo/ImportRepo1Test_gold b/system/t09_repo/ImportRepo1Test_gold index c4fa29ca..9e7a9597 100644 --- a/system/t09_repo/ImportRepo1Test_gold +++ b/system/t09_repo/ImportRepo1Test_gold @@ -1,4 +1,13 @@ Loading packages... +[o] nginx-extras_1.2.1-2.2+wheezy2_amd64 imported +[o] nginx-extras_1.2.1-2.2+wheezy2_i386 imported +[o] nginx-full_1.2.1-2.2+wheezy2_amd64 imported +[o] nginx-full_1.2.1-2.2+wheezy2_i386 imported +[o] nginx-light_1.2.1-2.2+wheezy2_amd64 imported +[o] nginx-light_1.2.1-2.2+wheezy2_i386 imported +[o] nginx-naxsi-ui_1.2.1-2.2+wheezy2_all imported +[o] nginx-naxsi_1.2.1-2.2+wheezy2_amd64 imported +[o] nginx-naxsi_1.2.1-2.2+wheezy2_i386 imported [o] nginx_1.2.1-2.2+wheezy2_all imported [o] unpaper_0.4.2-1_amd64 imported \ No newline at end of file diff --git a/system/t09_repo/ImportRepo1Test_repo_show b/system/t09_repo/ImportRepo1Test_repo_show index daf99d40..8b71f6d0 100644 --- a/system/t09_repo/ImportRepo1Test_repo_show +++ b/system/t09_repo/ImportRepo1Test_repo_show @@ -2,11 +2,20 @@ Name: repo1 Comment: Cool Default Distribution: squeeze Default Component: main -Number of packages: 6 +Number of packages: 15 Packages: libboost-program-options-dev_1.62.0.1_i386 libboost-program-options-dev_1.49.0.1_i386 nginx_1.2.1-2.2+wheezy2_all + nginx-extras_1.2.1-2.2+wheezy2_amd64 + nginx-extras_1.2.1-2.2+wheezy2_i386 + nginx-full_1.2.1-2.2+wheezy2_amd64 + nginx-full_1.2.1-2.2+wheezy2_i386 + nginx-light_1.2.1-2.2+wheezy2_amd64 + nginx-light_1.2.1-2.2+wheezy2_i386 + nginx-naxsi_1.2.1-2.2+wheezy2_amd64 + nginx-naxsi_1.2.1-2.2+wheezy2_i386 + nginx-naxsi-ui_1.2.1-2.2+wheezy2_all pyspi_0.6.1-1.4_source pyspi_0.6.1-1.3_source unpaper_0.4.2-1_amd64