Update system tests after Debian buster was released.

This commit is contained in:
Andrey Smirnov
2019-07-10 21:20:08 +03:00
committed by Andrey Smirnov
parent 3b8c067e70
commit 673abae1be
27 changed files with 67 additions and 62 deletions
@@ -2,9 +2,13 @@ Downloading http://mirror.yandex.ru/debian/dists/stretch-backports/InRelease...
gpgv: RSA key ID 2B90D010 gpgv: RSA key ID 2B90D010
gpgv: RSA key ID B7D453EC
Downloading http://mirror.yandex.ru/debian/dists/stretch-backports/Release... Downloading http://mirror.yandex.ru/debian/dists/stretch-backports/Release...
Downloading http://mirror.yandex.ru/debian/dists/stretch-backports/Release.gpg... Downloading http://mirror.yandex.ru/debian/dists/stretch-backports/Release.gpg...
gpgv: RSA key ID 2B90D010 gpgv: RSA key ID 2B90D010
gpgv: RSA key ID B7D453EC
ERROR: unable to fetch mirror: verification of detached signature failed: exit status 2 ERROR: unable to fetch mirror: verification of detached signature failed: exit status 2
+1 -4
View File
@@ -1,12 +1,9 @@
Downloading http://mirror.yandex.ru/debian/dists/stretch/InRelease... Downloading http://mirror.yandex.ru/debian/dists/stretch/InRelease...
Downloading http://mirror.yandex.ru/debian/dists/stretch/Release... Downloading http://mirror.yandex.ru/debian/dists/stretch/Release...
Downloading http://mirror.yandex.ru/debian/dists/stretch/Release.gpg... Downloading http://mirror.yandex.ru/debian/dists/stretch/Release.gpg...
gpgv: RSA key ID 46925553 gpgv: WARNING: multiple signatures detected. Only the first will be checked.
gpgv: Good signature from "Debian Archive Automatic Signing Key (7.0/wheezy) <ftpmaster@debian.org>"
gpgv: RSA key ID 2B90D010 gpgv: RSA key ID 2B90D010
gpgv: Good signature from "Debian Archive Automatic Signing Key (8/jessie) <ftpmaster@debian.org>" gpgv: Good signature from "Debian Archive Automatic Signing Key (8/jessie) <ftpmaster@debian.org>"
gpgv: RSA key ID 1A7B6500
gpgv: Good signature from "Debian Stable Release Key (9/stretch) <debian-release@lists.debian.org>"
Mirror [mirror11]: http://mirror.yandex.ru/debian/ stretch successfully added. Mirror [mirror11]: http://mirror.yandex.ru/debian/ stretch successfully added.
You can run 'aptly mirror update mirror11' to download repository contents. You can run 'aptly mirror update mirror11' to download repository contents.
@@ -13,10 +13,10 @@ Architectures: amd64 arm64 armel armhf i386 mips mips64el mipsel ppc64el s390x
Changelogs: http://metadata.ftp-master.debian.org/changelogs/@CHANGEPATH@_changelog Changelogs: http://metadata.ftp-master.debian.org/changelogs/@CHANGEPATH@_changelog
Codename: stretch Codename: stretch
Components: main contrib non-free Components: main contrib non-free
Date: Sat, 27 Apr 2019 09:29:22 UTC Date: Sat, 06 Jul 2019 09:10:16 UTC
Description: Debian 9.9 Released 27 April 2019 Description: Debian 9.9 Released 27 April 2019
Label: Debian Label: Debian
Origin: Debian Origin: Debian
Suite: stable Suite: oldstable
Version: 9.9 Version: 9.9
+1 -4
View File
@@ -2,10 +2,7 @@ Downloading http://mirror.yandex.ru/debian/dists/stretch/InRelease...
Downloading http://mirror.yandex.ru/debian/dists/stretch/Release... Downloading http://mirror.yandex.ru/debian/dists/stretch/Release...
Downloading http://mirror.yandex.ru/debian/dists/stretch/Release.gpg... Downloading http://mirror.yandex.ru/debian/dists/stretch/Release.gpg...
gpgv: RSA key ID 46925553 gpgv: WARNING: multiple signatures detected. Only the first will be checked.
gpgv: RSA key ID 2B90D010 gpgv: RSA key ID 2B90D010
gpgv: RSA key ID 1A7B6500
ERROR: unable to fetch mirror: verification of detached signature failed: exit status 2 ERROR: unable to fetch mirror: verification of detached signature failed: exit status 2
@@ -13,10 +13,10 @@ Architectures: amd64 arm64 armel armhf i386 mips mips64el mipsel ppc64el s390x
Changelogs: http://metadata.ftp-master.debian.org/changelogs/@CHANGEPATH@_changelog Changelogs: http://metadata.ftp-master.debian.org/changelogs/@CHANGEPATH@_changelog
Codename: stretch Codename: stretch
Components: main contrib non-free Components: main contrib non-free
Date: Sat, 27 Apr 2019 09:29:22 UTC Date: Sat, 06 Jul 2019 09:10:16 UTC
Description: Debian 9.9 Released 27 April 2019 Description: Debian 9.9 Released 27 April 2019
Label: Debian Label: Debian
Origin: Debian Origin: Debian
Suite: stable Suite: oldstable
Version: 9.9 Version: 9.9
@@ -13,10 +13,10 @@ Architectures: amd64 arm64 armel armhf i386 mips mips64el mipsel ppc64el s390x
Changelogs: http://metadata.ftp-master.debian.org/changelogs/@CHANGEPATH@_changelog Changelogs: http://metadata.ftp-master.debian.org/changelogs/@CHANGEPATH@_changelog
Codename: stretch Codename: stretch
Components: main contrib non-free Components: main contrib non-free
Date: Sat, 27 Apr 2019 09:29:22 UTC Date: Sat, 06 Jul 2019 09:10:16 UTC
Description: Debian 9.9 Released 27 April 2019 Description: Debian 9.9 Released 27 April 2019
Label: Debian Label: Debian
Origin: Debian Origin: Debian
Suite: stable Suite: oldstable
Version: 9.9 Version: 9.9
@@ -1,6 +1,8 @@
Downloading http://security.debian.org/dists/stretch/updates/InRelease... Downloading http://security.debian.org/dists/stretch/updates/InRelease...
gpgv: RSA key ID C857C906 gpgv: RSA key ID C857C906
gpgv: Good signature from "Debian Security Archive Automatic Signing Key (8/jessie) <ftpmaster@debian.org>" gpgv: Good signature from "Debian Security Archive Automatic Signing Key (8/jessie) <ftpmaster@debian.org>"
gpgv: RSA key ID 331F7F50
gpgv: Good signature from "Debian Security Archive Automatic Signing Key (9/stretch) <ftpmaster@debian.org>"
Mirror [mirror19]: http://security.debian.org/ stretch/updates [src] successfully added. Mirror [mirror19]: http://security.debian.org/ stretch/updates [src] successfully added.
You can run 'aptly mirror update mirror19' to download repository contents. You can run 'aptly mirror update mirror19' to download repository contents.
@@ -16,5 +16,5 @@ Description: Debian 9 Security Updates
Label: Debian-Security Label: Debian-Security
Origin: Debian Origin: Debian
Suite: stable Suite: oldstable
Version: 9 Version: 9
@@ -13,10 +13,10 @@ Architectures: amd64 arm64 armel armhf i386 mips mips64el mipsel ppc64el s390x
Changelogs: http://metadata.ftp-master.debian.org/changelogs/@CHANGEPATH@_changelog Changelogs: http://metadata.ftp-master.debian.org/changelogs/@CHANGEPATH@_changelog
Codename: stretch Codename: stretch
Components: main contrib non-free Components: main contrib non-free
Date: Sat, 27 Apr 2019 09:29:22 UTC Date: Sat, 06 Jul 2019 09:10:16 UTC
Description: Debian 9.9 Released 27 April 2019 Description: Debian 9.9 Released 27 April 2019
Label: Debian Label: Debian
Origin: Debian Origin: Debian
Suite: stable Suite: oldstable
Version: 9.9 Version: 9.9
@@ -18,5 +18,5 @@ Description: Debian 9 Security Updates
Label: Debian-Security Label: Debian-Security
Origin: Debian Origin: Debian
Suite: stable Suite: oldstable
Version: 9 Version: 9
@@ -1,6 +1,8 @@
Downloading http://security.debian.org/dists/stretch/updates/InRelease... Downloading http://security.debian.org/dists/stretch/updates/InRelease...
gpgv: RSA key ID C857C906 gpgv: RSA key ID C857C906
gpgv: Good signature from "Debian Security Archive Automatic Signing Key (8/jessie) <ftpmaster@debian.org>" gpgv: Good signature from "Debian Security Archive Automatic Signing Key (8/jessie) <ftpmaster@debian.org>"
gpgv: RSA key ID 331F7F50
gpgv: Good signature from "Debian Security Archive Automatic Signing Key (9/stretch) <ftpmaster@debian.org>"
Mirror [mirror24]: http://security.debian.org/ stretch/updates successfully added. Mirror [mirror24]: http://security.debian.org/ stretch/updates successfully added.
You can run 'aptly mirror update mirror24' to download repository contents. You can run 'aptly mirror update mirror24' to download repository contents.
@@ -13,10 +13,10 @@ Architectures: amd64 arm64 armel armhf i386 mips mips64el mipsel ppc64el s390x
Changelogs: http://metadata.ftp-master.debian.org/changelogs/@CHANGEPATH@_changelog Changelogs: http://metadata.ftp-master.debian.org/changelogs/@CHANGEPATH@_changelog
Codename: stretch Codename: stretch
Components: main contrib non-free Components: main contrib non-free
Date: Sat, 27 Apr 2019 09:29:22 UTC Date: Sat, 06 Jul 2019 09:10:16 UTC
Description: Debian 9.9 Released 27 April 2019 Description: Debian 9.9 Released 27 April 2019
Label: Debian Label: Debian
Origin: Debian Origin: Debian
Suite: stable Suite: oldstable
Version: 9.9 Version: 9.9
@@ -1,6 +1,8 @@
Downloading http://mirror.yandex.ru/debian/dists/stretch-backports/InRelease... Downloading http://mirror.yandex.ru/debian/dists/stretch-backports/InRelease...
openpgp: RSA key ID 7638D0442B90D010 openpgp: RSA key ID 7638D0442B90D010
openpgp: Good signature from "Debian Archive Automatic Signing Key (8/jessie) <ftpmaster@debian.org>" openpgp: Good signature from "Debian Archive Automatic Signing Key (8/jessie) <ftpmaster@debian.org>"
openpgp: RSA key ID 04EE7237B7D453EC
openpgp: Good signature from "Debian Archive Automatic Signing Key (9/stretch) <ftpmaster@debian.org>"
Mirror [mirror9]: http://mirror.yandex.ru/debian/ stretch-backports successfully added. Mirror [mirror9]: http://mirror.yandex.ru/debian/ stretch-backports successfully added.
You can run 'aptly mirror update mirror9' to download repository contents. You can run 'aptly mirror update mirror9' to download repository contents.
@@ -13,10 +13,10 @@ Architectures: amd64 arm64 armel armhf i386 mips mips64el mipsel ppc64el s390x
Changelogs: http://metadata.ftp-master.debian.org/changelogs/@CHANGEPATH@_changelog Changelogs: http://metadata.ftp-master.debian.org/changelogs/@CHANGEPATH@_changelog
Codename: stretch Codename: stretch
Components: main contrib non-free Components: main contrib non-free
Date: Sat, 27 Apr 2019 09:29:22 UTC Date: Sat, 06 Jul 2019 09:10:16 UTC
Description: Debian 9.9 Released 27 April 2019 Description: Debian 9.9 Released 27 April 2019
Label: Debian Label: Debian
Origin: Debian Origin: Debian
Suite: stable Suite: oldstable
Version: 9.9 Version: 9.9
+2 -2
View File
@@ -1,10 +1,10 @@
Downloading http://mirror.yandex.ru/debian/dists/stretch/InRelease... Downloading http://mirror.yandex.ru/debian/dists/stretch/InRelease...
Downloading http://mirror.yandex.ru/debian/dists/stretch/Release... Downloading http://mirror.yandex.ru/debian/dists/stretch/Release...
Downloading http://mirror.yandex.ru/debian/dists/stretch/Release.gpg... Downloading http://mirror.yandex.ru/debian/dists/stretch/Release.gpg...
openpgp: RSA key ID 8B48AD6246925553
openpgp: Good signature from "Debian Archive Automatic Signing Key (7.0/wheezy) <ftpmaster@debian.org>"
openpgp: RSA key ID 7638D0442B90D010 openpgp: RSA key ID 7638D0442B90D010
openpgp: Good signature from "Debian Archive Automatic Signing Key (8/jessie) <ftpmaster@debian.org>" openpgp: Good signature from "Debian Archive Automatic Signing Key (8/jessie) <ftpmaster@debian.org>"
openpgp: RSA key ID 04EE7237B7D453EC
openpgp: Good signature from "Debian Archive Automatic Signing Key (9/stretch) <ftpmaster@debian.org>"
Mirror [mirror11]: http://mirror.yandex.ru/debian/ stretch successfully added. Mirror [mirror11]: http://mirror.yandex.ru/debian/ stretch successfully added.
You can run 'aptly mirror update mirror11' to download repository contents. You can run 'aptly mirror update mirror11' to download repository contents.
+1 -2
View File
@@ -1,9 +1,8 @@
Downloading http://mirror.yandex.ru/debian/dists/stretch/InRelease... Downloading http://mirror.yandex.ru/debian/dists/stretch/InRelease...
Downloading http://mirror.yandex.ru/debian/dists/stretch/Release... Downloading http://mirror.yandex.ru/debian/dists/stretch/Release...
Downloading http://mirror.yandex.ru/debian/dists/stretch/Release.gpg... Downloading http://mirror.yandex.ru/debian/dists/stretch/Release.gpg...
gpgv: Good signature from "Debian Archive Automatic Signing Key (7.0/wheezy) <ftpmaster@debian.org>" gpgv: WARNING: multiple signatures detected. Only the first will be checked.
gpgv: Good signature from "Debian Archive Automatic Signing Key (8/jessie) <ftpmaster@debian.org>" gpgv: Good signature from "Debian Archive Automatic Signing Key (8/jessie) <ftpmaster@debian.org>"
gpgv: Good signature from "Debian Stable Release Key (9/stretch) <debian-release@lists.debian.org>"
Mirror [mirror32]: http://mirror.yandex.ru/debian/ stretch successfully added. Mirror [mirror32]: http://mirror.yandex.ru/debian/ stretch successfully added.
You can run 'aptly mirror update mirror32' to download repository contents. You can run 'aptly mirror update mirror32' to download repository contents.
@@ -13,10 +13,10 @@ Architectures: amd64 arm64 armel armhf i386 mips mips64el mipsel ppc64el s390x
Changelogs: http://metadata.ftp-master.debian.org/changelogs/@CHANGEPATH@_changelog Changelogs: http://metadata.ftp-master.debian.org/changelogs/@CHANGEPATH@_changelog
Codename: stretch Codename: stretch
Components: main contrib non-free Components: main contrib non-free
Date: Sat, 27 Apr 2019 09:29:22 UTC Date: Sat, 06 Jul 2019 09:10:16 UTC
Description: Debian 9.9 Released 27 April 2019 Description: Debian 9.9 Released 27 April 2019
Label: Debian Label: Debian
Origin: Debian Origin: Debian
Suite: stable Suite: oldstable
Version: 9.9 Version: 9.9
@@ -13,10 +13,10 @@ Architectures: amd64 arm64 armel armhf i386 mips mips64el mipsel ppc64el s390x
Changelogs: http://metadata.ftp-master.debian.org/changelogs/@CHANGEPATH@_changelog Changelogs: http://metadata.ftp-master.debian.org/changelogs/@CHANGEPATH@_changelog
Codename: stretch Codename: stretch
Components: main contrib non-free Components: main contrib non-free
Date: Sat, 27 Apr 2019 09:29:22 UTC Date: Sat, 06 Jul 2019 09:10:16 UTC
Description: Debian 9.9 Released 27 April 2019 Description: Debian 9.9 Released 27 April 2019
Label: Debian Label: Debian
Origin: Debian Origin: Debian
Suite: stable Suite: oldstable
Version: 9.9 Version: 9.9
@@ -13,10 +13,10 @@ Architectures: amd64 arm64 armel armhf i386 mips mips64el mipsel ppc64el s390x
Changelogs: http://metadata.ftp-master.debian.org/changelogs/@CHANGEPATH@_changelog Changelogs: http://metadata.ftp-master.debian.org/changelogs/@CHANGEPATH@_changelog
Codename: stretch Codename: stretch
Components: main contrib non-free Components: main contrib non-free
Date: Sat, 27 Apr 2019 09:29:22 UTC Date: Sat, 06 Jul 2019 09:10:16 UTC
Description: Debian 9.9 Released 27 April 2019 Description: Debian 9.9 Released 27 April 2019
Label: Debian Label: Debian
Origin: Debian Origin: Debian
Suite: stable Suite: oldstable
Version: 9.9 Version: 9.9
+2
View File
@@ -1,6 +1,8 @@
Downloading http://mirror.yandex.ru/debian/dists/stretch-backports/InRelease... Downloading http://mirror.yandex.ru/debian/dists/stretch-backports/InRelease...
gpgv: RSA key ID 2B90D010 gpgv: RSA key ID 2B90D010
gpgv: Good signature from "Debian Archive Automatic Signing Key (8/jessie) <ftpmaster@debian.org>" gpgv: Good signature from "Debian Archive Automatic Signing Key (8/jessie) <ftpmaster@debian.org>"
gpgv: RSA key ID B7D453EC
gpgv: Good signature from "Debian Archive Automatic Signing Key (9/stretch) <ftpmaster@debian.org>"
Mirror [mirror9]: http://mirror.yandex.ru/debian/ stretch-backports successfully added. Mirror [mirror9]: http://mirror.yandex.ru/debian/ stretch-backports successfully added.
You can run 'aptly mirror update mirror9' to download repository contents. You can run 'aptly mirror update mirror9' to download repository contents.
@@ -16,5 +16,5 @@ Description: Debian 9 Security Updates
Label: Debian-Security Label: Debian-Security
Origin: Debian Origin: Debian
Suite: stable Suite: oldstable
Version: 9 Version: 9
@@ -12,10 +12,10 @@ Architectures: amd64 arm64 armel armhf i386 mips mips64el mipsel ppc64el s390x
Changelogs: http://metadata.ftp-master.debian.org/changelogs/@CHANGEPATH@_changelog Changelogs: http://metadata.ftp-master.debian.org/changelogs/@CHANGEPATH@_changelog
Codename: stretch Codename: stretch
Components: main contrib non-free Components: main contrib non-free
Date: Sat, 27 Apr 2019 09:29:22 UTC Date: Sat, 06 Jul 2019 09:10:16 UTC
Description: Debian 9.9 Released 27 April 2019 Description: Debian 9.9 Released 27 April 2019
Label: Debian Label: Debian
Origin: Debian Origin: Debian
Suite: stable Suite: oldstable
Version: 9.9 Version: 9.9
+2 -2
View File
@@ -13,10 +13,10 @@ Architectures: amd64 arm64 armel armhf i386 mips mips64el mipsel ppc64el s390x
Changelogs: http://metadata.ftp-master.debian.org/changelogs/@CHANGEPATH@_changelog Changelogs: http://metadata.ftp-master.debian.org/changelogs/@CHANGEPATH@_changelog
Codename: stretch Codename: stretch
Components: main contrib non-free Components: main contrib non-free
Date: Sat, 27 Apr 2019 09:29:22 UTC Date: Sat, 06 Jul 2019 09:10:16 UTC
Description: Debian 9.9 Released 27 April 2019 Description: Debian 9.9 Released 27 April 2019
Label: Debian Label: Debian
Origin: Debian Origin: Debian
Suite: stable Suite: oldstable
Version: 9.9 Version: 9.9
+1 -1
View File
@@ -18,5 +18,5 @@ Description: Debian 9 Security Updates
Label: Debian-Security Label: Debian-Security
Origin: Debian Origin: Debian
Suite: stable Suite: oldstable
Version: 9 Version: 9
+1 -4
View File
@@ -37,9 +37,6 @@ Downloading http://mirror.yandex.ru/debian/pool/main/g/gnupg2/scdaemon_2.1.18-8~
Downloading http://mirror.yandex.ru/debian/pool/main/g/gnupg2/scdaemon_2.1.18-8~deb9u4_i386.deb... Downloading http://mirror.yandex.ru/debian/pool/main/g/gnupg2/scdaemon_2.1.18-8~deb9u4_i386.deb...
Mirror `stretch` has been successfully updated. Mirror `stretch` has been successfully updated.
Packages filtered: 78253 -> 20. Packages filtered: 78253 -> 20.
gpgv: Good signature from "Debian Archive Automatic Signing Key (7.0/wheezy) <ftpmaster@debian.org>"
gpgv: Good signature from "Debian Archive Automatic Signing Key (8/jessie) <ftpmaster@debian.org>" gpgv: Good signature from "Debian Archive Automatic Signing Key (8/jessie) <ftpmaster@debian.org>"
gpgv: Good signature from "Debian Stable Release Key (9/stretch) <debian-release@lists.debian.org>"
gpgv: RSA key ID 2B90D010 gpgv: RSA key ID 2B90D010
gpgv: RSA key ID 46925553 gpgv: WARNING: multiple signatures detected. Only the first will be checked.
gpgv: RSA key ID 1A7B6500
+1 -4
View File
@@ -21,9 +21,6 @@ Downloading http://mirror.yandex.ru/debian/dists/stretch/non-free/binary-s390x/P
Downloading http://mirror.yandex.ru/debian/dists/stretch/non-free/installer-s390x/current/images/SHA256SUMS... Downloading http://mirror.yandex.ru/debian/dists/stretch/non-free/installer-s390x/current/images/SHA256SUMS...
Mirror `stretch` has been successfully updated. Mirror `stretch` has been successfully updated.
Packages filtered: 49279 -> 1. Packages filtered: 49279 -> 1.
gpgv: Good signature from "Debian Archive Automatic Signing Key (7.0/wheezy) <ftpmaster@debian.org>"
gpgv: Good signature from "Debian Archive Automatic Signing Key (8/jessie) <ftpmaster@debian.org>" gpgv: Good signature from "Debian Archive Automatic Signing Key (8/jessie) <ftpmaster@debian.org>"
gpgv: Good signature from "Debian Stable Release Key (9/stretch) <debian-release@lists.debian.org>"
gpgv: RSA key ID 2B90D010 gpgv: RSA key ID 2B90D010
gpgv: RSA key ID 46925553 gpgv: WARNING: multiple signatures detected. Only the first will be checked.
gpgv: RSA key ID 1A7B6500
+22 -16
View File
@@ -103,7 +103,8 @@ class CreateMirror9Test(BaseTest):
return re.sub(r"(Date|Valid-Until): [,0-9:+A-Za-z -]+\n", "", s) return re.sub(r"(Date|Valid-Until): [,0-9:+A-Za-z -]+\n", "", s)
self.check_output() self.check_output()
self.check_cmd_output("aptly mirror show mirror9", "mirror_show", match_prepare=removeDates) self.check_cmd_output("aptly mirror show mirror9",
"mirror_show", match_prepare=removeDates)
class CreateMirror10Test(BaseTest): class CreateMirror10Test(BaseTest):
@@ -174,7 +175,8 @@ class CreateMirror14Test(BaseTest):
return re.sub(r"(Date|Valid-Until): [,0-9:+A-Za-z -]+\n", "", s) return re.sub(r"(Date|Valid-Until): [,0-9:+A-Za-z -]+\n", "", s)
self.check_output() self.check_output()
self.check_cmd_output("aptly mirror show mirror14", "mirror_show", match_prepare=removeDates) self.check_cmd_output("aptly mirror show mirror14",
"mirror_show", match_prepare=removeDates)
class CreateMirror15Test(BaseTest): class CreateMirror15Test(BaseTest):
@@ -241,7 +243,8 @@ class CreateMirror19Test(BaseTest):
return re.sub(r"(Date|Valid-Until): [,0-9:+A-Za-z -]+\n", "", s) return re.sub(r"(Date|Valid-Until): [,0-9:+A-Za-z -]+\n", "", s)
self.check_output() self.check_output()
self.check_cmd_output("aptly mirror show mirror19", "mirror_show", match_prepare=removeDates) self.check_cmd_output("aptly mirror show mirror19",
"mirror_show", match_prepare=removeDates)
class CreateMirror20Test(BaseTest): class CreateMirror20Test(BaseTest):
@@ -256,7 +259,8 @@ class CreateMirror20Test(BaseTest):
def outputMatchPrepare(self, s): def outputMatchPrepare(self, s):
return s.replace('getsockopt: ', '').replace('connect: ', ''). \ return s.replace('getsockopt: ', '').replace('connect: ', ''). \
replace('proxyconnect tcp', 'http: error connecting to proxy http://127.0.0.1:3137') replace('proxyconnect tcp',
'http: error connecting to proxy http://127.0.0.1:3137')
class CreateMirror21Test(BaseTest): class CreateMirror21Test(BaseTest):
@@ -277,7 +281,8 @@ class CreateMirror21Test(BaseTest):
return re.sub(r"(Date|Valid-Until): [,0-9:+A-Za-z -]+\n", "", s) return re.sub(r"(Date|Valid-Until): [,0-9:+A-Za-z -]+\n", "", s)
self.check_output() self.check_output()
self.check_cmd_output("aptly mirror show mirror21", "mirror_show", match_prepare=lambda s: removeSHA512(removeDates(s))) self.check_cmd_output("aptly mirror show mirror21", "mirror_show",
match_prepare=lambda s: removeSHA512(removeDates(s)))
class CreateMirror22Test(BaseTest): class CreateMirror22Test(BaseTest):
@@ -291,7 +296,8 @@ class CreateMirror22Test(BaseTest):
return re.sub(r"(Date|Valid-Until): [,0-9:+A-Za-z -]+\n", "", s) return re.sub(r"(Date|Valid-Until): [,0-9:+A-Za-z -]+\n", "", s)
self.check_output() self.check_output()
self.check_cmd_output("aptly mirror show mirror22", "mirror_show", match_prepare=removeDates) self.check_cmd_output("aptly mirror show mirror22",
"mirror_show", match_prepare=removeDates)
class CreateMirror23Test(BaseTest): class CreateMirror23Test(BaseTest):
@@ -337,16 +343,15 @@ class CreateMirror26Test(BaseTest):
expectedCode = 1 expectedCode = 1
# TODO: disabled as linux.dell.com doesn't resolve class CreateMirror27Test(BaseTest):
# class CreateMirror27Test(BaseTest): """
# """ create mirror: component with slashes, no stripping
# create mirror: component with slashes, no stripping """
# """ runCmd = "aptly mirror create --ignore-signatures mirror27 http://linux.dell.com/repo/community/ubuntu wheezy openmanage/740"
# runCmd = "aptly mirror create --ignore-signatures mirror27 http://linux.dell.com/repo/community/ubuntu wheezy openmanage/740"
# def check(self): def check(self):
# self.check_output() self.check_output()
# self.check_cmd_output("aptly mirror show mirror27", "mirror_show") self.check_cmd_output("aptly mirror show mirror27", "mirror_show")
class CreateMirror28Test(BaseTest): class CreateMirror28Test(BaseTest):
@@ -360,7 +365,8 @@ class CreateMirror28Test(BaseTest):
return re.sub(r"(Date|Valid-Until): [,0-9:+A-Za-z -]+\n", "", s) return re.sub(r"(Date|Valid-Until): [,0-9:+A-Za-z -]+\n", "", s)
self.check_output() self.check_output()
self.check_cmd_output("aptly mirror show mirror28", "mirror_show", match_prepare=removeDates) self.check_cmd_output("aptly mirror show mirror28",
"mirror_show", match_prepare=removeDates)
class CreateMirror29Test(BaseTest): class CreateMirror29Test(BaseTest):