From 703940ccbe50b15e69da210e77d68a48be070f9c Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Sat, 3 Aug 2019 00:01:11 +0300 Subject: [PATCH] Fix few tests --- system/t03_help/MirrorCreateHelpTest_gold | 3 ++- system/t04_mirror/CreateMirror30Test_gold | 13 ++++++++----- system/t04_mirror/create.py | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/system/t03_help/MirrorCreateHelpTest_gold b/system/t03_help/MirrorCreateHelpTest_gold index dd7552d41..debf7621a 100644 --- a/system/t03_help/MirrorCreateHelpTest_gold +++ b/system/t03_help/MirrorCreateHelpTest_gold @@ -10,7 +10,7 @@ PPA urls could specified in short format: Example: - $ aptly mirror create wheezy-main http://cdn-fastly.deb.debian.org/debian/ wheezy main + $ aptly mirror create wheezy-main http://mirror.yandex.ru/debian/ wheezy main Options: -architectures="": list of architectures to consider during (comma-separated), default to all available @@ -31,3 +31,4 @@ Options: -with-installer: download additional not packaged installer files -with-sources: download source packages in addition to binary packages -with-udebs: download .udeb packages (Debian installer support) + diff --git a/system/t04_mirror/CreateMirror30Test_gold b/system/t04_mirror/CreateMirror30Test_gold index da2a1b709..247309a2c 100644 --- a/system/t04_mirror/CreateMirror30Test_gold +++ b/system/t04_mirror/CreateMirror30Test_gold @@ -1,8 +1,11 @@ -opengpg: failure opening keyring '/home/smira/.gnupg/aptlytest.gpg': open /home/smira/.gnupg/aptlytest.gpg: no such file or directory +opengpg: failure opening keyring '${HOME}/.gnupg/aptlytest.gpg': open ${HOME}/.gnupg/aptlytest.gpg: no such file or directory Looks like your keyring with trusted keys is empty. You might consider importing some keys. -Downloading http://ftp.us.debian.org/debian-backports/dists/squeeze-backports/InRelease... -openpgp: RSA key ID 8B48AD6246925553 +Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/InRelease... +Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/Release... +Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/Release.gpg... +openpgp: RSA key ID 7638D0442B90D010 openpgp: Can't check signature: public key not found -Downloading http://ftp.us.debian.org/debian-backports/dists/squeeze-backports/Release... -ERROR: unable to fetch mirror: HTTP code 404 while fetching http://ftp.us.debian.org/debian-backports/dists/squeeze-backports/Release +openpgp: RSA key ID 04EE7237B7D453EC +openpgp: Can't check signature: public key not found +ERROR: unable to fetch mirror: failed to verify detached signature: openpgp: signature made by unknown entity diff --git a/system/t04_mirror/create.py b/system/t04_mirror/create.py index 77558ed52..12bc8d9cc 100644 --- a/system/t04_mirror/create.py +++ b/system/t04_mirror/create.py @@ -385,7 +385,7 @@ class CreateMirror30Test(BaseTest): """ create mirror: repo with InRelease verification, failure (internal GPG implementation) """ - runCmd = "aptly mirror create --keyring=aptlytest.gpg mirror10 http://ftp.us.debian.org/debian-backports/ squeeze-backports" + runCmd = "aptly mirror create --keyring=aptlytest.gpg mirror10 http://cdn-fastly.deb.debian.org/debian/ stretch" configOverride = {"gpgProvider": "internal"} gold_processor = BaseTest.expand_environ fixtureGpg = False