diff --git a/system/t04_mirror/CreateMirror10Test_gold b/system/t04_mirror/CreateMirror10Test_gold index d92c7baad..4de7b2fbe 100644 --- a/system/t04_mirror/CreateMirror10Test_gold +++ b/system/t04_mirror/CreateMirror10Test_gold @@ -2,9 +2,13 @@ Downloading http://mirror.yandex.ru/debian/dists/stretch-backports/InRelease... 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.gpg... gpgv: RSA key ID 2B90D010 +gpgv: RSA key ID B7D453EC + ERROR: unable to fetch mirror: verification of detached signature failed: exit status 2 diff --git a/system/t04_mirror/CreateMirror11Test_gold b/system/t04_mirror/CreateMirror11Test_gold index 536c40efa..54d167d23 100644 --- a/system/t04_mirror/CreateMirror11Test_gold +++ b/system/t04_mirror/CreateMirror11Test_gold @@ -1,12 +1,9 @@ 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.gpg... -gpgv: RSA key ID 46925553 -gpgv: Good signature from "Debian Archive Automatic Signing Key (7.0/wheezy) " +gpgv: WARNING: multiple signatures detected. Only the first will be checked. gpgv: RSA key ID 2B90D010 gpgv: Good signature from "Debian Archive Automatic Signing Key (8/jessie) " -gpgv: RSA key ID 1A7B6500 -gpgv: Good signature from "Debian Stable Release Key (9/stretch) " Mirror [mirror11]: http://mirror.yandex.ru/debian/ stretch successfully added. You can run 'aptly mirror update mirror11' to download repository contents. diff --git a/system/t04_mirror/CreateMirror11Test_mirror_show b/system/t04_mirror/CreateMirror11Test_mirror_show index 8dd99164a..89fea47c2 100644 --- a/system/t04_mirror/CreateMirror11Test_mirror_show +++ b/system/t04_mirror/CreateMirror11Test_mirror_show @@ -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 Codename: stretch 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 Label: Debian Origin: Debian -Suite: stable +Suite: oldstable Version: 9.9 diff --git a/system/t04_mirror/CreateMirror12Test_gold b/system/t04_mirror/CreateMirror12Test_gold index 8c1a328c4..4cfbda9a3 100644 --- a/system/t04_mirror/CreateMirror12Test_gold +++ b/system/t04_mirror/CreateMirror12Test_gold @@ -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.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 1A7B6500 - ERROR: unable to fetch mirror: verification of detached signature failed: exit status 2 diff --git a/system/t04_mirror/CreateMirror13Test_mirror_show b/system/t04_mirror/CreateMirror13Test_mirror_show index 732098941..e33f70505 100644 --- a/system/t04_mirror/CreateMirror13Test_mirror_show +++ b/system/t04_mirror/CreateMirror13Test_mirror_show @@ -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 Codename: stretch 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 Label: Debian Origin: Debian -Suite: stable +Suite: oldstable Version: 9.9 diff --git a/system/t04_mirror/CreateMirror17Test_mirror_show b/system/t04_mirror/CreateMirror17Test_mirror_show index 627c53b93..7d9b41742 100644 --- a/system/t04_mirror/CreateMirror17Test_mirror_show +++ b/system/t04_mirror/CreateMirror17Test_mirror_show @@ -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 Codename: stretch 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 Label: Debian Origin: Debian -Suite: stable +Suite: oldstable Version: 9.9 diff --git a/system/t04_mirror/CreateMirror19Test_gold b/system/t04_mirror/CreateMirror19Test_gold index 6e0454fe3..61eebd098 100644 --- a/system/t04_mirror/CreateMirror19Test_gold +++ b/system/t04_mirror/CreateMirror19Test_gold @@ -1,6 +1,8 @@ Downloading http://security.debian.org/dists/stretch/updates/InRelease... gpgv: RSA key ID C857C906 gpgv: Good signature from "Debian Security Archive Automatic Signing Key (8/jessie) " +gpgv: RSA key ID 331F7F50 +gpgv: Good signature from "Debian Security Archive Automatic Signing Key (9/stretch) " Mirror [mirror19]: http://security.debian.org/ stretch/updates [src] successfully added. You can run 'aptly mirror update mirror19' to download repository contents. diff --git a/system/t04_mirror/CreateMirror19Test_mirror_show b/system/t04_mirror/CreateMirror19Test_mirror_show index 6498b71b9..edf1a8a6b 100644 --- a/system/t04_mirror/CreateMirror19Test_mirror_show +++ b/system/t04_mirror/CreateMirror19Test_mirror_show @@ -16,5 +16,5 @@ Description: Debian 9 Security Updates Label: Debian-Security Origin: Debian -Suite: stable +Suite: oldstable Version: 9 diff --git a/system/t04_mirror/CreateMirror1Test_mirror_show b/system/t04_mirror/CreateMirror1Test_mirror_show index 5b3821943..d1dcf469e 100644 --- a/system/t04_mirror/CreateMirror1Test_mirror_show +++ b/system/t04_mirror/CreateMirror1Test_mirror_show @@ -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 Codename: stretch 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 Label: Debian Origin: Debian -Suite: stable +Suite: oldstable Version: 9.9 diff --git a/system/t04_mirror/CreateMirror22Test_mirror_show b/system/t04_mirror/CreateMirror22Test_mirror_show index f202c9150..91a7aa164 100644 --- a/system/t04_mirror/CreateMirror22Test_mirror_show +++ b/system/t04_mirror/CreateMirror22Test_mirror_show @@ -18,5 +18,5 @@ Description: Debian 9 Security Updates Label: Debian-Security Origin: Debian -Suite: stable +Suite: oldstable Version: 9 diff --git a/system/t04_mirror/CreateMirror24Test_gold b/system/t04_mirror/CreateMirror24Test_gold index b4e99b866..0ad30a4f2 100644 --- a/system/t04_mirror/CreateMirror24Test_gold +++ b/system/t04_mirror/CreateMirror24Test_gold @@ -1,6 +1,8 @@ Downloading http://security.debian.org/dists/stretch/updates/InRelease... gpgv: RSA key ID C857C906 gpgv: Good signature from "Debian Security Archive Automatic Signing Key (8/jessie) " +gpgv: RSA key ID 331F7F50 +gpgv: Good signature from "Debian Security Archive Automatic Signing Key (9/stretch) " Mirror [mirror24]: http://security.debian.org/ stretch/updates successfully added. You can run 'aptly mirror update mirror24' to download repository contents. diff --git a/system/t04_mirror/CreateMirror25Test_mirror_show b/system/t04_mirror/CreateMirror25Test_mirror_show index 5b9c6e3b1..ceb1d3105 100644 --- a/system/t04_mirror/CreateMirror25Test_mirror_show +++ b/system/t04_mirror/CreateMirror25Test_mirror_show @@ -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 Codename: stretch 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 Label: Debian Origin: Debian -Suite: stable +Suite: oldstable Version: 9.9 diff --git a/system/t04_mirror/CreateMirror29Test_gold b/system/t04_mirror/CreateMirror29Test_gold index 43146c3a0..c41b9ff08 100644 --- a/system/t04_mirror/CreateMirror29Test_gold +++ b/system/t04_mirror/CreateMirror29Test_gold @@ -1,6 +1,8 @@ Downloading http://mirror.yandex.ru/debian/dists/stretch-backports/InRelease... openpgp: RSA key ID 7638D0442B90D010 openpgp: Good signature from "Debian Archive Automatic Signing Key (8/jessie) " +openpgp: RSA key ID 04EE7237B7D453EC +openpgp: Good signature from "Debian Archive Automatic Signing Key (9/stretch) " Mirror [mirror9]: http://mirror.yandex.ru/debian/ stretch-backports successfully added. You can run 'aptly mirror update mirror9' to download repository contents. diff --git a/system/t04_mirror/CreateMirror2Test_mirror_show b/system/t04_mirror/CreateMirror2Test_mirror_show index bf954ffa8..f7015a86a 100644 --- a/system/t04_mirror/CreateMirror2Test_mirror_show +++ b/system/t04_mirror/CreateMirror2Test_mirror_show @@ -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 Codename: stretch 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 Label: Debian Origin: Debian -Suite: stable +Suite: oldstable Version: 9.9 diff --git a/system/t04_mirror/CreateMirror31Test_gold b/system/t04_mirror/CreateMirror31Test_gold index 9beabb9f2..1a8210b7c 100644 --- a/system/t04_mirror/CreateMirror31Test_gold +++ b/system/t04_mirror/CreateMirror31Test_gold @@ -1,10 +1,10 @@ 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.gpg... -openpgp: RSA key ID 8B48AD6246925553 -openpgp: Good signature from "Debian Archive Automatic Signing Key (7.0/wheezy) " openpgp: RSA key ID 7638D0442B90D010 openpgp: Good signature from "Debian Archive Automatic Signing Key (8/jessie) " +openpgp: RSA key ID 04EE7237B7D453EC +openpgp: Good signature from "Debian Archive Automatic Signing Key (9/stretch) " Mirror [mirror11]: http://mirror.yandex.ru/debian/ stretch successfully added. You can run 'aptly mirror update mirror11' to download repository contents. diff --git a/system/t04_mirror/CreateMirror32Test_gold b/system/t04_mirror/CreateMirror32Test_gold index feab0146d..9e941179f 100644 --- a/system/t04_mirror/CreateMirror32Test_gold +++ b/system/t04_mirror/CreateMirror32Test_gold @@ -1,9 +1,8 @@ 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.gpg... -gpgv: Good signature from "Debian Archive Automatic Signing Key (7.0/wheezy) " +gpgv: WARNING: multiple signatures detected. Only the first will be checked. gpgv: Good signature from "Debian Archive Automatic Signing Key (8/jessie) " -gpgv: Good signature from "Debian Stable Release Key (9/stretch) " Mirror [mirror32]: http://mirror.yandex.ru/debian/ stretch successfully added. You can run 'aptly mirror update mirror32' to download repository contents. diff --git a/system/t04_mirror/CreateMirror32Test_mirror_show b/system/t04_mirror/CreateMirror32Test_mirror_show index bd028d8f3..445443e8a 100644 --- a/system/t04_mirror/CreateMirror32Test_mirror_show +++ b/system/t04_mirror/CreateMirror32Test_mirror_show @@ -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 Codename: stretch 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 Label: Debian Origin: Debian -Suite: stable +Suite: oldstable Version: 9.9 diff --git a/system/t04_mirror/CreateMirror3Test_mirror_show b/system/t04_mirror/CreateMirror3Test_mirror_show index c31328dd4..5087cfbb6 100644 --- a/system/t04_mirror/CreateMirror3Test_mirror_show +++ b/system/t04_mirror/CreateMirror3Test_mirror_show @@ -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 Codename: stretch 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 Label: Debian Origin: Debian -Suite: stable +Suite: oldstable Version: 9.9 diff --git a/system/t04_mirror/CreateMirror7Test_mirror_show b/system/t04_mirror/CreateMirror7Test_mirror_show index 74d2c7fad..9ab426074 100644 --- a/system/t04_mirror/CreateMirror7Test_mirror_show +++ b/system/t04_mirror/CreateMirror7Test_mirror_show @@ -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 Codename: stretch 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 Label: Debian Origin: Debian -Suite: stable +Suite: oldstable Version: 9.9 diff --git a/system/t04_mirror/CreateMirror9Test_gold b/system/t04_mirror/CreateMirror9Test_gold index b6e4569d1..30b955a48 100644 --- a/system/t04_mirror/CreateMirror9Test_gold +++ b/system/t04_mirror/CreateMirror9Test_gold @@ -1,6 +1,8 @@ Downloading http://mirror.yandex.ru/debian/dists/stretch-backports/InRelease... gpgv: RSA key ID 2B90D010 gpgv: Good signature from "Debian Archive Automatic Signing Key (8/jessie) " +gpgv: RSA key ID B7D453EC +gpgv: Good signature from "Debian Archive Automatic Signing Key (9/stretch) " Mirror [mirror9]: http://mirror.yandex.ru/debian/ stretch-backports successfully added. You can run 'aptly mirror update mirror9' to download repository contents. diff --git a/system/t04_mirror/EditMirror5Test_mirror_show b/system/t04_mirror/EditMirror5Test_mirror_show index 7daad990d..43b0d09ed 100644 --- a/system/t04_mirror/EditMirror5Test_mirror_show +++ b/system/t04_mirror/EditMirror5Test_mirror_show @@ -16,5 +16,5 @@ Description: Debian 9 Security Updates Label: Debian-Security Origin: Debian -Suite: stable +Suite: oldstable Version: 9 diff --git a/system/t04_mirror/EditMirror6Test_mirror_show b/system/t04_mirror/EditMirror6Test_mirror_show index a6f9d5337..03f31a523 100644 --- a/system/t04_mirror/EditMirror6Test_mirror_show +++ b/system/t04_mirror/EditMirror6Test_mirror_show @@ -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 Codename: stretch 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 Label: Debian Origin: Debian -Suite: stable +Suite: oldstable Version: 9.9 diff --git a/system/t04_mirror/ShowMirror1Test_gold b/system/t04_mirror/ShowMirror1Test_gold index 5b3821943..d1dcf469e 100644 --- a/system/t04_mirror/ShowMirror1Test_gold +++ b/system/t04_mirror/ShowMirror1Test_gold @@ -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 Codename: stretch 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 Label: Debian Origin: Debian -Suite: stable +Suite: oldstable Version: 9.9 diff --git a/system/t04_mirror/ShowMirror4Test_gold b/system/t04_mirror/ShowMirror4Test_gold index 695252b60..8cbd0dba3 100644 --- a/system/t04_mirror/ShowMirror4Test_gold +++ b/system/t04_mirror/ShowMirror4Test_gold @@ -18,5 +18,5 @@ Description: Debian 9 Security Updates Label: Debian-Security Origin: Debian -Suite: stable +Suite: oldstable Version: 9 diff --git a/system/t04_mirror/UpdateMirror12Test_gold b/system/t04_mirror/UpdateMirror12Test_gold index 94a0e2ee5..43a7aa36b 100644 --- a/system/t04_mirror/UpdateMirror12Test_gold +++ b/system/t04_mirror/UpdateMirror12Test_gold @@ -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... Mirror `stretch` has been successfully updated. Packages filtered: 78253 -> 20. -gpgv: Good signature from "Debian Archive Automatic Signing Key (7.0/wheezy) " gpgv: Good signature from "Debian Archive Automatic Signing Key (8/jessie) " -gpgv: Good signature from "Debian Stable Release Key (9/stretch) " gpgv: RSA key ID 2B90D010 -gpgv: RSA key ID 46925553 -gpgv: RSA key ID 1A7B6500 \ No newline at end of file +gpgv: WARNING: multiple signatures detected. Only the first will be checked. \ No newline at end of file diff --git a/system/t04_mirror/UpdateMirror23Test_gold b/system/t04_mirror/UpdateMirror23Test_gold index 743624af3..029bd8188 100644 --- a/system/t04_mirror/UpdateMirror23Test_gold +++ b/system/t04_mirror/UpdateMirror23Test_gold @@ -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... Mirror `stretch` has been successfully updated. Packages filtered: 49279 -> 1. -gpgv: Good signature from "Debian Archive Automatic Signing Key (7.0/wheezy) " gpgv: Good signature from "Debian Archive Automatic Signing Key (8/jessie) " -gpgv: Good signature from "Debian Stable Release Key (9/stretch) " gpgv: RSA key ID 2B90D010 -gpgv: RSA key ID 46925553 -gpgv: RSA key ID 1A7B6500 \ No newline at end of file +gpgv: WARNING: multiple signatures detected. Only the first will be checked. \ No newline at end of file diff --git a/system/t04_mirror/create.py b/system/t04_mirror/create.py index 4fb60768f..8f1ab6ff7 100644 --- a/system/t04_mirror/create.py +++ b/system/t04_mirror/create.py @@ -103,7 +103,8 @@ def removeDates(s): return re.sub(r"(Date|Valid-Until): [,0-9:+A-Za-z -]+\n", "", s) 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): @@ -174,7 +175,8 @@ def removeDates(s): return re.sub(r"(Date|Valid-Until): [,0-9:+A-Za-z -]+\n", "", s) 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): @@ -241,7 +243,8 @@ def removeDates(s): return re.sub(r"(Date|Valid-Until): [,0-9:+A-Za-z -]+\n", "", s) 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): @@ -256,7 +259,8 @@ class CreateMirror20Test(BaseTest): def outputMatchPrepare(self, s): 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): @@ -277,7 +281,8 @@ def removeDates(s): return re.sub(r"(Date|Valid-Until): [,0-9:+A-Za-z -]+\n", "", s) 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): @@ -291,7 +296,8 @@ def removeDates(s): return re.sub(r"(Date|Valid-Until): [,0-9:+A-Za-z -]+\n", "", s) 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): @@ -337,16 +343,15 @@ class CreateMirror26Test(BaseTest): expectedCode = 1 -# TODO: disabled as linux.dell.com doesn't resolve -# class CreateMirror27Test(BaseTest): -# """ -# create mirror: component with slashes, no stripping -# """ -# runCmd = "aptly mirror create --ignore-signatures mirror27 http://linux.dell.com/repo/community/ubuntu wheezy openmanage/740" +class CreateMirror27Test(BaseTest): + """ + create mirror: component with slashes, no stripping + """ + runCmd = "aptly mirror create --ignore-signatures mirror27 http://linux.dell.com/repo/community/ubuntu wheezy openmanage/740" -# def check(self): -# self.check_output() -# self.check_cmd_output("aptly mirror show mirror27", "mirror_show") + def check(self): + self.check_output() + self.check_cmd_output("aptly mirror show mirror27", "mirror_show") class CreateMirror28Test(BaseTest): @@ -360,7 +365,8 @@ def removeDates(s): return re.sub(r"(Date|Valid-Until): [,0-9:+A-Za-z -]+\n", "", s) 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):