New algorithm for dependency resolution, tests. #100 #81

system/t04_mirror/SearchMirror4Test_gold

@@ -1,12 +1,15 @@
 
 coreutils_8.13-3.5_amd64
 coreutils_8.13-3.5_i386
+debconf_1.5.49_all
 dpkg_1.16.12_amd64
 dpkg_1.16.12_i386
+fontconfig-config_2.9.0-7.1_all
+fonts-freefont-ttf_20120503-1_all
 gcc-4.7-base_4.7.2-5_amd64
 gcc-4.7-base_4.7.2-5_i386
-install-info_4.13a.dfsg.1-10_amd64
+gsfonts-x11_0.22_all
-install-info_4.13a.dfsg.1-10_i386
+gsfonts_1:8.11+urwcyr1.0.7~pre44-4.2_all
 libacl1_2.2.51-8_amd64
 libacl1_2.2.51-8_i386
 libattr1_1:2.4.46-8_amd64
@@ -17,15 +20,76 @@ libc-bin_2.13-38+deb7u1_amd64
 libc-bin_2.13-38+deb7u1_i386
 libc6_2.13-38+deb7u1_amd64
 libc6_2.13-38+deb7u1_i386
+libexpat1_2.1.0-1+deb7u1_amd64
+libexpat1_2.1.0-1+deb7u1_i386
+libfontconfig1_2.9.0-7.1_amd64
+libfontconfig1_2.9.0-7.1_i386
+libfontenc1_1:1.1.1-1_amd64
+libfontenc1_1:1.1.1-1_i386
+libfreetype6_2.4.9-1.1_amd64
+libfreetype6_2.4.9-1.1_i386
 libgcc1_1:4.7.2-5_amd64
 libgcc1_1:4.7.2-5_i386
+libgcrypt11_1.5.0-5+deb7u1_amd64
+libgcrypt11_1.5.0-5+deb7u1_i386
+libgd2-noxpm_2.0.36~rc1~dfsg-6.1_amd64
+libgd2-noxpm_2.0.36~rc1~dfsg-6.1_i386
+libgd2-xpm_2.0.36~rc1~dfsg-6.1_amd64
+libgd2-xpm_2.0.36~rc1~dfsg-6.1_i386
+libgeoip1_1.4.8+dfsg-3_amd64
+libgeoip1_1.4.8+dfsg-3_i386
+libgpg-error0_1.10-3.1_amd64
+libgpg-error0_1.10-3.1_i386
+libjpeg8_8d-1_amd64
+libjpeg8_8d-1_i386
 liblzma5_5.1.1alpha+20120614-2_amd64
 liblzma5_5.1.1alpha+20120614-2_i386
+libpam0g_1.1.3-7.1_amd64
+libpam0g_1.1.3-7.1_i386
+libpcre3_1:8.30-5_amd64
+libpcre3_1:8.30-5_i386
+libpng12-0_1.2.49-1_amd64
+libpng12-0_1.2.49-1_i386
 libselinux1_2.1.9-5_amd64
 libselinux1_2.1.9-5_i386
+libssl1.0.0_1.0.1e-2+deb7u7_amd64
+libssl1.0.0_1.0.1e-2+deb7u7_i386
+libx11-6_2:1.5.0-1+deb7u1_amd64
+libx11-6_2:1.5.0-1+deb7u1_i386
+libx11-data_2:1.5.0-1+deb7u1_all
+libxau6_1:1.0.7-1_amd64
+libxau6_1:1.0.7-1_i386
+libxcb1_1.8.1-2+deb7u1_amd64
+libxcb1_1.8.1-2+deb7u1_i386
+libxdmcp6_1:1.1.1-1_amd64
+libxdmcp6_1:1.1.1-1_i386
+libxfont1_1:1.4.5-3_amd64
+libxfont1_1:1.4.5-3_i386
+libxml2_2.8.0+dfsg1-7+nmu3_amd64
+libxml2_2.8.0+dfsg1-7+nmu3_i386
+libxpm4_1:3.5.10-1_amd64
+libxpm4_1:3.5.10-1_i386
+libxslt1.1_1.1.26-14.1_amd64
+libxslt1.1_1.1.26-14.1_i386
+lsb-base_4.1+Debian8+deb7u1_all
 multiarch-support_2.13-38+deb7u1_amd64
 multiarch-support_2.13-38+deb7u1_i386
+nginx-common_1.2.1-2.2+wheezy2_all
+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_1.2.1-2.2+wheezy2_all
+perl-base_5.14.2-21+deb7u1_amd64
+perl-base_5.14.2-21+deb7u1_i386
 tar_1.26+dfsg-0.1_amd64
 tar_1.26+dfsg-0.1_i386
+ttf-bitstream-vera_1.10-8_all
+ttf-dejavu-core_2.33-3_all
+ucf_3.0025+nmu3_all
+x11-common_1:7.7+3~deb7u1_all
+xfonts-encodings_1:1.0.4-1_all
+xfonts-utils_1:7.7~1_amd64
+xfonts-utils_1:7.7~1_i386
 zlib1g_1:1.2.7.dfsg-13_amd64
 zlib1g_1:1.2.7.dfsg-13_i386

system/t04_mirror/search.py

@@ -33,4 +33,4 @@ class SearchMirror4Test(BaseTest):
     """
     fixtureDB = True
     outputMatchPrepare = lambda _, s: "\n".join(sorted(s.split("\n")))
-    runCmd = "aptly mirror search -with-deps wheezy-main 'Name (coreutils)'"
+    runCmd = "aptly mirror search -with-deps wheezy-main 'Name (nginx)'"

system/t05_snapshot/SearchSnapshot4Test_gold

@@ -1,12 +1,15 @@
 
 coreutils_8.13-3.5_amd64
 coreutils_8.13-3.5_i386
+debconf_1.5.49_all
 dpkg_1.16.12_amd64
 dpkg_1.16.12_i386
+fontconfig-config_2.9.0-7.1_all
+fonts-freefont-ttf_20120503-1_all
 gcc-4.7-base_4.7.2-5_amd64
 gcc-4.7-base_4.7.2-5_i386
-install-info_4.13a.dfsg.1-10_amd64
+gsfonts-x11_0.22_all
-install-info_4.13a.dfsg.1-10_i386
+gsfonts_1:8.11+urwcyr1.0.7~pre44-4.2_all
 libacl1_2.2.51-8_amd64
 libacl1_2.2.51-8_i386
 libattr1_1:2.4.46-8_amd64
@@ -17,15 +20,76 @@ libc-bin_2.13-38+deb7u1_amd64
 libc-bin_2.13-38+deb7u1_i386
 libc6_2.13-38+deb7u1_amd64
 libc6_2.13-38+deb7u1_i386
+libexpat1_2.1.0-1+deb7u1_amd64
+libexpat1_2.1.0-1+deb7u1_i386
+libfontconfig1_2.9.0-7.1_amd64
+libfontconfig1_2.9.0-7.1_i386
+libfontenc1_1:1.1.1-1_amd64
+libfontenc1_1:1.1.1-1_i386
+libfreetype6_2.4.9-1.1_amd64
+libfreetype6_2.4.9-1.1_i386
 libgcc1_1:4.7.2-5_amd64
 libgcc1_1:4.7.2-5_i386
+libgcrypt11_1.5.0-5+deb7u1_amd64
+libgcrypt11_1.5.0-5+deb7u1_i386
+libgd2-noxpm_2.0.36~rc1~dfsg-6.1_amd64
+libgd2-noxpm_2.0.36~rc1~dfsg-6.1_i386
+libgd2-xpm_2.0.36~rc1~dfsg-6.1_amd64
+libgd2-xpm_2.0.36~rc1~dfsg-6.1_i386
+libgeoip1_1.4.8+dfsg-3_amd64
+libgeoip1_1.4.8+dfsg-3_i386
+libgpg-error0_1.10-3.1_amd64
+libgpg-error0_1.10-3.1_i386
+libjpeg8_8d-1_amd64
+libjpeg8_8d-1_i386
 liblzma5_5.1.1alpha+20120614-2_amd64
 liblzma5_5.1.1alpha+20120614-2_i386
+libpam0g_1.1.3-7.1_amd64
+libpam0g_1.1.3-7.1_i386
+libpcre3_1:8.30-5_amd64
+libpcre3_1:8.30-5_i386
+libpng12-0_1.2.49-1_amd64
+libpng12-0_1.2.49-1_i386
 libselinux1_2.1.9-5_amd64
 libselinux1_2.1.9-5_i386
+libssl1.0.0_1.0.1e-2+deb7u7_amd64
+libssl1.0.0_1.0.1e-2+deb7u7_i386
+libx11-6_2:1.5.0-1+deb7u1_amd64
+libx11-6_2:1.5.0-1+deb7u1_i386
+libx11-data_2:1.5.0-1+deb7u1_all
+libxau6_1:1.0.7-1_amd64
+libxau6_1:1.0.7-1_i386
+libxcb1_1.8.1-2+deb7u1_amd64
+libxcb1_1.8.1-2+deb7u1_i386
+libxdmcp6_1:1.1.1-1_amd64
+libxdmcp6_1:1.1.1-1_i386
+libxfont1_1:1.4.5-3_amd64
+libxfont1_1:1.4.5-3_i386
+libxml2_2.8.0+dfsg1-7+nmu3_amd64
+libxml2_2.8.0+dfsg1-7+nmu3_i386
+libxpm4_1:3.5.10-1_amd64
+libxpm4_1:3.5.10-1_i386
+libxslt1.1_1.1.26-14.1_amd64
+libxslt1.1_1.1.26-14.1_i386
+lsb-base_4.1+Debian8+deb7u1_all
 multiarch-support_2.13-38+deb7u1_amd64
 multiarch-support_2.13-38+deb7u1_i386
+nginx-common_1.2.1-2.2+wheezy2_all
+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_1.2.1-2.2+wheezy2_all
+perl-base_5.14.2-21+deb7u1_amd64
+perl-base_5.14.2-21+deb7u1_i386
 tar_1.26+dfsg-0.1_amd64
 tar_1.26+dfsg-0.1_i386
+ttf-bitstream-vera_1.10-8_all
+ttf-dejavu-core_2.33-3_all
+ucf_3.0025+nmu3_all
+x11-common_1:7.7+3~deb7u1_all
+xfonts-encodings_1:1.0.4-1_all
+xfonts-utils_1:7.7~1_amd64
+xfonts-utils_1:7.7~1_i386
 zlib1g_1:1.2.7.dfsg-13_amd64
 zlib1g_1:1.2.7.dfsg-13_i386

system/t05_snapshot/VerifySnapshot4Test_gold

@@ -1,6 +1,6 @@
 Loading packages...
 Verifying...
-Missing dependencies (1742):
+Missing dependencies (1737):
   915resolution [i386]
   9fonts [i386]
   abakus [i386]
@@ -74,7 +74,6 @@ Missing dependencies (1742):
   big-blast [i386]
   bigdft [i386]
   bigsdb [i386]
-  bind [i386]
   bioclipse [i386]
   bioimagesuite [i386]
   bioimagexd [i386]
@@ -205,7 +204,6 @@ Missing dependencies (1742):
   elmer-doc [i386]
   elph [i386]
   emacs-wiki [i386]
-  emacs22 [i386]
   emacs23-common-non-dfsg [i386]
   emacspeak-ss [i386]
   embassy [i386]
@@ -576,7 +574,6 @@ Missing dependencies (1742):
   kbackgammon [i386]
   kbdcontrol [i386]
   kchart [i386]
-  kde [i386]
   kde-icons-crystal [i386]
   kde-icons-oxygen [i386]
   kde-l10n (>= 4:4.8.4) [i386]
@@ -1644,7 +1641,6 @@ Missing dependencies (1742):
   ttf-larabie-deco [i386]
   ttf-larabie-straight [i386]
   ttf-mscorefonts-installer [i386]
-  ttf-thryomanes [i386]
   ttf-ubuntu-font-family (>= 0.80-0ubuntu1~medium) [i386]
   ttf2pt1 [i386]
   tuxpaint (= 1:0.9.21) [i386]
@@ -1726,7 +1722,6 @@ Missing dependencies (1742):
   xmind [i386]
   xnat [i386]
   xorsa [i386]
-  xpdf-reader [i386]
   xsidplay [i386]
   xtranslate [i386]
   xul-ext-gnome-keyring [i386]

system/t05_snapshot/VerifySnapshot5Test_gold

@@ -1,6 +1,6 @@
 Loading packages...
 Verifying...
-Missing dependencies (1622):
+Missing dependencies (1617):
   915resolution [i386]
   9fonts [i386]
   abakus [i386]
@@ -71,7 +71,6 @@ Missing dependencies (1622):
   big-blast [i386]
   bigdft [i386]
   bigsdb [i386]
-  bind [i386]
   bioclipse [i386]
   bioimagesuite [i386]
   bioimagexd [i386]
@@ -188,7 +187,6 @@ Missing dependencies (1622):
   elexis [i386]
   elph [i386]
   emacs-wiki [i386]
-  emacs22 [i386]
   emacspeak-ss [i386]
   embassy [i386]
   embassy-phylip [i386]
@@ -515,7 +513,6 @@ Missing dependencies (1622):
   kbackgammon [i386]
   kbdcontrol [i386]
   kchart [i386]
-  kde [i386]
   kde-icons-crystal [i386]
   kde-icons-oxygen [i386]
   kde-l10n (>= 4:4.8.4) [i386]
@@ -1535,7 +1532,6 @@ Missing dependencies (1622):
   tripal [i386]
   trnascan-se [i386]
   tscope [i386]
-  ttf-thryomanes [i386]
   ttf-ubuntu-font-family (>= 0.80-0ubuntu1~medium) [i386]
   ttf2pt1 [i386]
   tuxpaint (= 1:0.9.21) [i386]
@@ -1607,7 +1603,6 @@ Missing dependencies (1622):
   xmind [i386]
   xnat [i386]
   xorsa [i386]
-  xpdf-reader [i386]
   xsidplay [i386]
   xtranslate [i386]
   xul-ext-gnome-keyring [i386]

system/t05_snapshot/VerifySnapshot6Test_gold

@@ -1,6 +1,6 @@
 Loading packages...
 Verifying...
-Missing dependencies (3797):
+Missing dependencies (3781):
   915resolution [amd64]
   915resolution [i386]
   9fonts [amd64]
@@ -51,8 +51,6 @@ Missing dependencies (3797):
   angband-audio [i386]
   aolserver-doc (>= 4.0.1-1) [amd64]
   aolserver-doc (>= 4.0.1-1) [i386]
-  apache [amd64]
-  apache [i386]
   apache-ssl [amd64]
   apache-ssl [i386]
   ape [amd64]
@@ -161,8 +159,6 @@ Missing dependencies (3797):
   bigdft [i386]
   bigsdb [amd64]
   bigsdb [i386]
-  bind [amd64]
-  bind [i386]
   bioclipse [amd64]
   bioclipse [i386]
   bioimagesuite [amd64]
@@ -458,8 +454,6 @@ Missing dependencies (3797):
   elph [i386]
   emacs-wiki [amd64]
   emacs-wiki [i386]
-  emacs22 [amd64]
-  emacs22 [i386]
   emacs23-common-non-dfsg [amd64]
   emacs23-common-non-dfsg [i386]
   emacspeak-ss [amd64]
@@ -1264,8 +1258,6 @@ Missing dependencies (3797):
   kbdcontrol [i386]
   kchart [amd64]
   kchart [i386]
-  kde [amd64]
-  kde [i386]
   kde-i18n-he [amd64]
   kde-i18n-he [i386]
   kde-icons-crystal [amd64]
@@ -2192,8 +2184,6 @@ Missing dependencies (3797):
   mesquite [i386]
   metadisorder [amd64]
   metadisorder [i386]
-  metamail [amd64]
-  metamail [i386]
   metarep [amd64]
   metarep [i386]
   mga-vid-module [amd64]
@@ -3508,8 +3498,6 @@ Missing dependencies (3797):
   tc-utils [i386]
   tempo [amd64]
   tempo [i386]
-  tetex-bin [amd64]
-  tetex-bin [i386]
   tetra [amd64]
   tetra [i386]
   texinfo-doc-nonfree [amd64]
@@ -3590,8 +3578,6 @@ Missing dependencies (3797):
   ttf-larabie-straight [i386]
   ttf-mscorefonts-installer [amd64]
   ttf-mscorefonts-installer [i386]
-  ttf-thryomanes [amd64]
-  ttf-thryomanes [i386]
   ttf-ubuntu-font-family (>= 0.80-0ubuntu1~medium) [amd64]
   ttf-ubuntu-font-family (>= 0.80-0ubuntu1~medium) [i386]
   ttf2pt1 [amd64]
@@ -3760,8 +3746,6 @@ Missing dependencies (3797):
   xnat [i386]
   xorsa [amd64]
   xorsa [i386]
-  xpdf-reader [amd64]
-  xpdf-reader [i386]
   xsidplay [amd64]
   xsidplay [i386]
   xtranslate [amd64]

system/t05_snapshot/search.py

@@ -36,4 +36,4 @@ class SearchSnapshot4Test(BaseTest):
     fixtureDB = True
     fixtureCmds = ["aptly snapshot create wheezy-main from mirror wheezy-main"]
     outputMatchPrepare = lambda _, s: "\n".join(sorted(s.split("\n")))
-    runCmd = "aptly snapshot search -with-deps wheezy-main 'Name (coreutils)'"
+    runCmd = "aptly snapshot search -with-deps wheezy-main 'Name (nginx)'"

system/t09_repo/SearchRepo4Test_gold

@@ -1,12 +1,15 @@
 
 coreutils_8.13-3.5_amd64
 coreutils_8.13-3.5_i386
+debconf_1.5.49_all
 dpkg_1.16.12_amd64
 dpkg_1.16.12_i386
+fontconfig-config_2.9.0-7.1_all
+fonts-freefont-ttf_20120503-1_all
 gcc-4.7-base_4.7.2-5_amd64
 gcc-4.7-base_4.7.2-5_i386
-install-info_4.13a.dfsg.1-10_amd64
+gsfonts-x11_0.22_all
-install-info_4.13a.dfsg.1-10_i386
+gsfonts_1:8.11+urwcyr1.0.7~pre44-4.2_all
 libacl1_2.2.51-8_amd64
 libacl1_2.2.51-8_i386
 libattr1_1:2.4.46-8_amd64
@@ -17,15 +20,76 @@ libc-bin_2.13-38+deb7u1_amd64
 libc-bin_2.13-38+deb7u1_i386
 libc6_2.13-38+deb7u1_amd64
 libc6_2.13-38+deb7u1_i386
+libexpat1_2.1.0-1+deb7u1_amd64
+libexpat1_2.1.0-1+deb7u1_i386
+libfontconfig1_2.9.0-7.1_amd64
+libfontconfig1_2.9.0-7.1_i386
+libfontenc1_1:1.1.1-1_amd64
+libfontenc1_1:1.1.1-1_i386
+libfreetype6_2.4.9-1.1_amd64
+libfreetype6_2.4.9-1.1_i386
 libgcc1_1:4.7.2-5_amd64
 libgcc1_1:4.7.2-5_i386
+libgcrypt11_1.5.0-5+deb7u1_amd64
+libgcrypt11_1.5.0-5+deb7u1_i386
+libgd2-noxpm_2.0.36~rc1~dfsg-6.1_amd64
+libgd2-noxpm_2.0.36~rc1~dfsg-6.1_i386
+libgd2-xpm_2.0.36~rc1~dfsg-6.1_amd64
+libgd2-xpm_2.0.36~rc1~dfsg-6.1_i386
+libgeoip1_1.4.8+dfsg-3_amd64
+libgeoip1_1.4.8+dfsg-3_i386
+libgpg-error0_1.10-3.1_amd64
+libgpg-error0_1.10-3.1_i386
+libjpeg8_8d-1_amd64
+libjpeg8_8d-1_i386
 liblzma5_5.1.1alpha+20120614-2_amd64
 liblzma5_5.1.1alpha+20120614-2_i386
+libpam0g_1.1.3-7.1_amd64
+libpam0g_1.1.3-7.1_i386
+libpcre3_1:8.30-5_amd64
+libpcre3_1:8.30-5_i386
+libpng12-0_1.2.49-1_amd64
+libpng12-0_1.2.49-1_i386
 libselinux1_2.1.9-5_amd64
 libselinux1_2.1.9-5_i386
+libssl1.0.0_1.0.1e-2+deb7u7_amd64
+libssl1.0.0_1.0.1e-2+deb7u7_i386
+libx11-6_2:1.5.0-1+deb7u1_amd64
+libx11-6_2:1.5.0-1+deb7u1_i386
+libx11-data_2:1.5.0-1+deb7u1_all
+libxau6_1:1.0.7-1_amd64
+libxau6_1:1.0.7-1_i386
+libxcb1_1.8.1-2+deb7u1_amd64
+libxcb1_1.8.1-2+deb7u1_i386
+libxdmcp6_1:1.1.1-1_amd64
+libxdmcp6_1:1.1.1-1_i386
+libxfont1_1:1.4.5-3_amd64
+libxfont1_1:1.4.5-3_i386
+libxml2_2.8.0+dfsg1-7+nmu3_amd64
+libxml2_2.8.0+dfsg1-7+nmu3_i386
+libxpm4_1:3.5.10-1_amd64
+libxpm4_1:3.5.10-1_i386
+libxslt1.1_1.1.26-14.1_amd64
+libxslt1.1_1.1.26-14.1_i386
+lsb-base_4.1+Debian8+deb7u1_all
 multiarch-support_2.13-38+deb7u1_amd64
 multiarch-support_2.13-38+deb7u1_i386
+nginx-common_1.2.1-2.2+wheezy2_all
+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_1.2.1-2.2+wheezy2_all
+perl-base_5.14.2-21+deb7u1_amd64
+perl-base_5.14.2-21+deb7u1_i386
 tar_1.26+dfsg-0.1_amd64
 tar_1.26+dfsg-0.1_i386
+ttf-bitstream-vera_1.10-8_all
+ttf-dejavu-core_2.33-3_all
+ucf_3.0025+nmu3_all
+x11-common_1:7.7+3~deb7u1_all
+xfonts-encodings_1:1.0.4-1_all
+xfonts-utils_1:7.7~1_amd64
+xfonts-utils_1:7.7~1_i386
 zlib1g_1:1.2.7.dfsg-13_amd64
 zlib1g_1:1.2.7.dfsg-13_i386

system/t09_repo/search.py

@@ -36,4 +36,4 @@ class SearchRepo4Test(BaseTest):
     fixtureDB = True
     fixtureCmds = ["aptly repo create wheezy-main", "aptly repo import wheezy-main wheezy-main Name"]
     outputMatchPrepare = lambda _, s: "\n".join(sorted(s.split("\n")))
-    runCmd = "aptly repo search -with-deps wheezy-main 'Name (coreutils)'"
+    runCmd = "aptly repo search -with-deps wheezy-main 'Name (nginx)'"