From bb1def291092706f0f1c429aa155079a480c5873 Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Wed, 10 Jul 2019 22:15:12 +0300 Subject: [PATCH] Try Travis on xenial workers --- .travis.yml | 2 +- pgp/gnupg.go | 2 +- pgp/gnupg_finder.go | 7 +- pgp/gnupg_test.go | 11 +- system/t06_publish/repo.py | 231 ++++++++++++++++++++++++------------- 5 files changed, 167 insertions(+), 86 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2207f20af..6506824e6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ -dist: trusty +dist: xenial sudo: required language: go diff --git a/pgp/gnupg.go b/pgp/gnupg.go index 82be859e5..5205a450e 100644 --- a/pgp/gnupg.go +++ b/pgp/gnupg.go @@ -78,7 +78,7 @@ func (g *GpgSigner) gpgArgs() []string { if g.batch { args = append(args, "--no-tty", "--batch") - if g.version == GPG21xPlus { + if g.version >= GPG21x { args = append(args, "--pinentry-mode", "loopback") } } diff --git a/pgp/gnupg_finder.go b/pgp/gnupg_finder.go index 683bba82f..bb610c8a8 100644 --- a/pgp/gnupg_finder.go +++ b/pgp/gnupg_finder.go @@ -14,7 +14,8 @@ type GPGVersion int const ( GPG1x GPGVersion = 1 GPG20x GPGVersion = 2 - GPG21xPlus GPGVersion = 3 + GPG21x GPGVersion = 3 + GPG22xPlus GPGVersion = 4 ) var gpgVersionRegex = regexp.MustCompile(`\(GnuPG\) (\d)\.(\d)`) @@ -135,13 +136,15 @@ func cliVersionCheck(cmd string, marker string) (result bool, version GPGVersion strOutput := string(output) result = strings.Contains(strOutput, marker) - version = GPG21xPlus + version = GPG22xPlus matches := gpgVersionRegex.FindStringSubmatch(strOutput) if matches != nil { if matches[1] == "1" { version = GPG1x } else if matches[1] == "2" && matches[2] == "0" { version = GPG20x + } else if matches[1] == "2" && matches[2] == "1" { + version = GPG21x } } diff --git a/pgp/gnupg_test.go b/pgp/gnupg_test.go index 9ee8dfa40..e1a30a0b2 100644 --- a/pgp/gnupg_test.go +++ b/pgp/gnupg_test.go @@ -158,6 +158,9 @@ func (s *Gnupg2SignerSuite) SetUpTest(c *C) { if err != nil { c.Skip(err.Error()) } + if ver == GPG21x { + c.Skip("skipping sign test on GnuPG 2.1.x, due to loopback pinentry mode troubles") + } // import private keys into gpg2, they're stored outside of keyring files for _, item := range []struct { @@ -172,11 +175,11 @@ func (s *Gnupg2SignerSuite) SetUpTest(c *C) { continue } - args := []string{"--import", "--no-default-keyring"} + args := []string{"--import", "--no-default-keyring", "--batch"} if item.suffix == "_passprhase" { - args = append(args, "--passphrase", "verysecret", "--no-tty", "--batch") - if ver == GPG21xPlus { + args = append(args, "--passphrase", "verysecret", "--no-tty") + if ver >= GPG21x { args = append(args, "--pinentry-mode", "loopback") } } @@ -190,7 +193,7 @@ func (s *Gnupg2SignerSuite) SetUpTest(c *C) { // import public keys into gpg2 // we can't use pre-built keyrings as gpg 2.0.x and 2.1+ have different keyring formats for _, suffix := range []string{"", "_passphrase"} { - output, err := exec.Command(gpg, "--no-default-keyring", "--keyring", "./keyrings/aptly2"+suffix+".gpg", + output, err := exec.Command(gpg, "--no-default-keyring", "--batch", "--keyring", "./keyrings/aptly2"+suffix+".gpg", "--import", "keyrings/aptly2"+suffix+".pub.armor").CombinedOutput() c.Log(string(output)) c.Check(err, IsNil) diff --git a/system/t06_publish/repo.py b/system/t06_publish/repo.py index bb61f9d3b..6686ef761 100644 --- a/system/t06_publish/repo.py +++ b/system/t06_publish/repo.py @@ -37,7 +37,8 @@ def check(self): self.check_exists('public/dists/maverick/main/binary-i386/Packages') self.check_exists('public/dists/maverick/main/binary-i386/Packages.gz') - self.check_exists('public/dists/maverick/main/binary-i386/Packages.bz2') + self.check_exists( + 'public/dists/maverick/main/binary-i386/Packages.bz2') self.check_exists('public/dists/maverick/main/Contents-i386.gz') self.check_exists('public/dists/maverick/main/source/Sources') self.check_exists('public/dists/maverick/main/source/Sources.gz') @@ -46,21 +47,29 @@ def check(self): self.check_exists('public/pool/main/p/pyspi/pyspi_0.6.1-1.3.dsc') self.check_exists('public/pool/main/p/pyspi/pyspi_0.6.1-1.3.diff.gz') self.check_exists('public/pool/main/p/pyspi/pyspi_0.6.1.orig.tar.gz') - self.check_exists('public/pool/main/p/pyspi/pyspi-0.6.1-1.3.stripped.dsc') - self.check_exists('public/pool/main/b/boost-defaults/libboost-program-options-dev_1.49.0.1_i386.deb') + self.check_exists( + 'public/pool/main/p/pyspi/pyspi-0.6.1-1.3.stripped.dsc') + self.check_exists( + 'public/pool/main/b/boost-defaults/libboost-program-options-dev_1.49.0.1_i386.deb') # verify contents except of sums - self.check_file_contents('public/dists/maverick/Release', 'release', match_prepare=strip_processor) - self.check_file_contents('public/dists/maverick/main/source/Sources', 'sources', match_prepare=lambda s: "\n".join(sorted(s.split("\n")))) - self.check_file_contents('public/dists/maverick/main/binary-i386/Packages', 'binary', match_prepare=lambda s: "\n".join(sorted(s.split("\n")))) - self.check_file_contents('public/dists/maverick/main/Contents-i386.gz', 'contents_i386', match_prepare=ungzip_if_required) - self.check_file_contents('public/dists/maverick/Contents-i386.gz', 'contents_i386_legacy', match_prepare=ungzip_if_required) + self.check_file_contents( + 'public/dists/maverick/Release', 'release', match_prepare=strip_processor) + self.check_file_contents('public/dists/maverick/main/source/Sources', + 'sources', match_prepare=lambda s: "\n".join(sorted(s.split("\n")))) + self.check_file_contents('public/dists/maverick/main/binary-i386/Packages', + 'binary', match_prepare=lambda s: "\n".join(sorted(s.split("\n")))) + self.check_file_contents('public/dists/maverick/main/Contents-i386.gz', + 'contents_i386', match_prepare=ungzip_if_required) + self.check_file_contents('public/dists/maverick/Contents-i386.gz', + 'contents_i386_legacy', match_prepare=ungzip_if_required) # verify signatures self.run_cmd([self.gpgFinder.gpg, "--no-auto-check-trustdb", "--keyring", os.path.join(os.path.dirname(inspect.getsourcefile(BaseTest)), "files", "aptly.pub"), "--verify", os.path.join(os.environ["HOME"], ".aptly", 'public/dists/maverick/InRelease')]) self.run_cmd([self.gpgFinder.gpg, "--no-auto-check-trustdb", "--keyring", os.path.join(os.path.dirname(inspect.getsourcefile(BaseTest)), "files", "aptly.pub"), - "--verify", os.path.join(os.environ["HOME"], ".aptly", 'public/dists/maverick/Release.gpg'), + "--verify", os.path.join( + os.environ["HOME"], ".aptly", 'public/dists/maverick/Release.gpg'), os.path.join(os.environ["HOME"], ".aptly", 'public/dists/maverick/Release')]) # verify sums @@ -77,9 +86,11 @@ def check(self): fileSize = int(fileSize) - st = os.stat(os.path.join(os.environ["HOME"], ".aptly", 'public/dists/maverick/', path)) + st = os.stat(os.path.join( + os.environ["HOME"], ".aptly", 'public/dists/maverick/', path)) if fileSize != st.st_size: - raise Exception("file size doesn't match for %s: %d != %d" % (path, fileSize, st.st_size)) + raise Exception("file size doesn't match for %s: %d != %d" % ( + path, fileSize, st.st_size)) if len(fileHash) == 32: h = hashlib.md5() @@ -90,10 +101,12 @@ def check(self): else: h = hashlib.sha512() - h.update(self.read_file(os.path.join('public/dists/maverick', path))) + h.update(self.read_file(os.path.join( + 'public/dists/maverick', path))) if h.hexdigest() != fileHash: - raise Exception("file hash doesn't match for %s: %s != %s" % (path, fileHash, h.hexdigest())) + raise Exception("file hash doesn't match for %s: %s != %s" % ( + path, fileHash, h.hexdigest())) if pathsSeen != set(['main/binary-i386/Packages', 'main/binary-i386/Packages.bz2', 'main/binary-i386/Packages.gz', 'main/source/Sources', 'main/source/Sources.gz', 'main/source/Sources.bz2', @@ -121,18 +134,24 @@ def check(self): self.check_exists('public/dists/maverick/Release.gpg') self.check_exists('public/dists/maverick/contrib/binary-i386/Packages') - self.check_exists('public/dists/maverick/contrib/binary-i386/Packages.gz') - self.check_exists('public/dists/maverick/contrib/binary-i386/Packages.bz2') + self.check_exists( + 'public/dists/maverick/contrib/binary-i386/Packages.gz') + self.check_exists( + 'public/dists/maverick/contrib/binary-i386/Packages.bz2') self.check_exists('public/dists/maverick/contrib/Contents-i386.gz') self.check_exists('public/dists/maverick/contrib/source/Sources') self.check_exists('public/dists/maverick/contrib/source/Sources.gz') self.check_exists('public/dists/maverick/contrib/source/Sources.bz2') self.check_exists('public/pool/contrib/p/pyspi/pyspi_0.6.1-1.3.dsc') - self.check_exists('public/pool/contrib/p/pyspi/pyspi_0.6.1-1.3.diff.gz') - self.check_exists('public/pool/contrib/p/pyspi/pyspi_0.6.1.orig.tar.gz') - self.check_exists('public/pool/contrib/p/pyspi/pyspi-0.6.1-1.3.stripped.dsc') - self.check_exists('public/pool/contrib/b/boost-defaults/libboost-program-options-dev_1.49.0.1_i386.deb') + self.check_exists( + 'public/pool/contrib/p/pyspi/pyspi_0.6.1-1.3.diff.gz') + self.check_exists( + 'public/pool/contrib/p/pyspi/pyspi_0.6.1.orig.tar.gz') + self.check_exists( + 'public/pool/contrib/p/pyspi/pyspi-0.6.1-1.3.stripped.dsc') + self.check_exists( + 'public/pool/contrib/b/boost-defaults/libboost-program-options-dev_1.49.0.1_i386.deb') class PublishRepo3Test(BaseTest): @@ -154,18 +173,27 @@ def check(self): self.check_exists('public/dists/maverick/Release.gpg') self.check_exists('public/dists/maverick/contrib/binary-i386/Packages') - self.check_exists('public/dists/maverick/contrib/binary-i386/Packages.gz') - self.check_exists('public/dists/maverick/contrib/binary-i386/Packages.bz2') + self.check_exists( + 'public/dists/maverick/contrib/binary-i386/Packages.gz') + self.check_exists( + 'public/dists/maverick/contrib/binary-i386/Packages.bz2') self.check_exists('public/dists/maverick/contrib/Contents-i386.gz') self.check_not_exists('public/dists/maverick/contrib/source/Sources') - self.check_not_exists('public/dists/maverick/contrib/source/Sources.gz') - self.check_not_exists('public/dists/maverick/contrib/source/Sources.bz2') - - self.check_not_exists('public/pool/contrib/p/pyspi/pyspi_0.6.1-1.3.dsc') - self.check_not_exists('public/pool/contrib/p/pyspi/pyspi_0.6.1-1.3.diff.gz') - self.check_not_exists('public/pool/contrib/p/pyspi/pyspi_0.6.1.orig.tar.gz') - self.check_not_exists('public/pool/contrib/p/pyspi/pyspi-0.6.1-1.3.stripped.dsc') - self.check_exists('public/pool/contrib/b/boost-defaults/libboost-program-options-dev_1.49.0.1_i386.deb') + self.check_not_exists( + 'public/dists/maverick/contrib/source/Sources.gz') + self.check_not_exists( + 'public/dists/maverick/contrib/source/Sources.bz2') + + self.check_not_exists( + 'public/pool/contrib/p/pyspi/pyspi_0.6.1-1.3.dsc') + self.check_not_exists( + 'public/pool/contrib/p/pyspi/pyspi_0.6.1-1.3.diff.gz') + self.check_not_exists( + 'public/pool/contrib/p/pyspi/pyspi_0.6.1.orig.tar.gz') + self.check_not_exists( + 'public/pool/contrib/p/pyspi/pyspi-0.6.1-1.3.stripped.dsc') + self.check_exists( + 'public/pool/contrib/b/boost-defaults/libboost-program-options-dev_1.49.0.1_i386.deb') class PublishRepo4Test(BaseTest): @@ -186,19 +214,26 @@ def check(self): self.check_exists('public/ppa/dists/maverick/Release') self.check_exists('public/ppa/dists/maverick/Release.gpg') - self.check_exists('public/ppa/dists/maverick/main/binary-i386/Packages') - self.check_exists('public/ppa/dists/maverick/main/binary-i386/Packages.gz') - self.check_exists('public/ppa/dists/maverick/main/binary-i386/Packages.bz2') + self.check_exists( + 'public/ppa/dists/maverick/main/binary-i386/Packages') + self.check_exists( + 'public/ppa/dists/maverick/main/binary-i386/Packages.gz') + self.check_exists( + 'public/ppa/dists/maverick/main/binary-i386/Packages.bz2') self.check_exists('public/ppa/dists/maverick/main/Contents-i386.gz') self.check_exists('public/ppa/dists/maverick/main/source/Sources') self.check_exists('public/ppa/dists/maverick/main/source/Sources.gz') self.check_exists('public/ppa/dists/maverick/main/source/Sources.bz2') self.check_exists('public/ppa/pool/main/p/pyspi/pyspi_0.6.1-1.3.dsc') - self.check_exists('public/ppa/pool/main/p/pyspi/pyspi_0.6.1-1.3.diff.gz') - self.check_exists('public/ppa/pool/main/p/pyspi/pyspi_0.6.1.orig.tar.gz') - self.check_exists('public/ppa/pool/main/p/pyspi/pyspi-0.6.1-1.3.stripped.dsc') - self.check_exists('public/ppa/pool/main/b/boost-defaults/libboost-program-options-dev_1.49.0.1_i386.deb') + self.check_exists( + 'public/ppa/pool/main/p/pyspi/pyspi_0.6.1-1.3.diff.gz') + self.check_exists( + 'public/ppa/pool/main/p/pyspi/pyspi_0.6.1.orig.tar.gz') + self.check_exists( + 'public/ppa/pool/main/p/pyspi/pyspi-0.6.1-1.3.stripped.dsc') + self.check_exists( + 'public/ppa/pool/main/b/boost-defaults/libboost-program-options-dev_1.49.0.1_i386.deb') class PublishRepo5Test(BaseTest): @@ -310,14 +345,16 @@ def check(self): self.check_exists('public/dists/maverick/main/binary-i386/Packages') self.check_exists('public/dists/maverick/main/binary-i386/Packages.gz') - self.check_exists('public/dists/maverick/main/binary-i386/Packages.bz2') + self.check_exists( + 'public/dists/maverick/main/binary-i386/Packages.bz2') self.check_exists('public/dists/maverick/main/Contents-i386.gz') self.check_exists('public/dists/maverick/main/source/Sources') self.check_exists('public/dists/maverick/main/source/Sources.gz') self.check_exists('public/dists/maverick/main/source/Sources.bz2') # verify contents except of sums - self.check_file_contents('public/dists/maverick/Release', 'release', match_prepare=strip_processor) + self.check_file_contents( + 'public/dists/maverick/Release', 'release', match_prepare=strip_processor) class PublishRepo13Test(BaseTest): @@ -351,18 +388,24 @@ def check(self): self.check_exists('public/dists/maverick/Release.gpg') self.check_exists('public/dists/maverick/contrib/binary-i386/Packages') - self.check_exists('public/dists/maverick/contrib/binary-i386/Packages.gz') - self.check_exists('public/dists/maverick/contrib/binary-i386/Packages.bz2') + self.check_exists( + 'public/dists/maverick/contrib/binary-i386/Packages.gz') + self.check_exists( + 'public/dists/maverick/contrib/binary-i386/Packages.bz2') self.check_exists('public/dists/maverick/contrib/Contents-i386.gz') self.check_exists('public/dists/maverick/contrib/source/Sources') self.check_exists('public/dists/maverick/contrib/source/Sources.gz') self.check_exists('public/dists/maverick/contrib/source/Sources.bz2') self.check_exists('public/pool/contrib/p/pyspi/pyspi_0.6.1-1.3.dsc') - self.check_exists('public/pool/contrib/p/pyspi/pyspi_0.6.1-1.3.diff.gz') - self.check_exists('public/pool/contrib/p/pyspi/pyspi_0.6.1.orig.tar.gz') - self.check_exists('public/pool/contrib/p/pyspi/pyspi-0.6.1-1.3.stripped.dsc') - self.check_exists('public/pool/contrib/b/boost-defaults/libboost-program-options-dev_1.49.0.1_i386.deb') + self.check_exists( + 'public/pool/contrib/p/pyspi/pyspi_0.6.1-1.3.diff.gz') + self.check_exists( + 'public/pool/contrib/p/pyspi/pyspi_0.6.1.orig.tar.gz') + self.check_exists( + 'public/pool/contrib/p/pyspi/pyspi-0.6.1-1.3.stripped.dsc') + self.check_exists( + 'public/pool/contrib/b/boost-defaults/libboost-program-options-dev_1.49.0.1_i386.deb') class PublishRepo15Test(BaseTest): @@ -380,7 +423,8 @@ def check(self): super(PublishRepo15Test, self).check() # verify contents except of sums - self.check_file_contents('public/dists/maverick/Release', 'release', match_prepare=strip_processor) + self.check_file_contents( + 'public/dists/maverick/Release', 'release', match_prepare=strip_processor) class PublishRepo16Test(BaseTest): @@ -403,7 +447,8 @@ def check(self): self.check_exists('public/dists/maverick/main/binary-i386/Packages') self.check_exists('public/dists/maverick/main/binary-i386/Packages.gz') - self.check_exists('public/dists/maverick/main/binary-i386/Packages.bz2') + self.check_exists( + 'public/dists/maverick/main/binary-i386/Packages.bz2') self.check_exists('public/dists/maverick/main/source/Sources') self.check_exists('public/dists/maverick/main/source/Sources.gz') self.check_exists('public/dists/maverick/main/source/Sources.bz2') @@ -431,14 +476,17 @@ def check(self): self.check_exists('public/dists/maverick/main/binary-i386/Packages') self.check_exists('public/dists/maverick/main/binary-i386/Packages.gz') - self.check_exists('public/dists/maverick/main/binary-i386/Packages.bz2') + self.check_exists( + 'public/dists/maverick/main/binary-i386/Packages.bz2') self.check_exists('public/dists/maverick/main/source/Sources') self.check_exists('public/dists/maverick/main/source/Sources.gz') self.check_exists('public/dists/maverick/main/source/Sources.bz2') self.check_exists('public/dists/maverick/contrib/binary-i386/Packages') - self.check_exists('public/dists/maverick/contrib/binary-i386/Packages.gz') - self.check_exists('public/dists/maverick/contrib/binary-i386/Packages.bz2') + self.check_exists( + 'public/dists/maverick/contrib/binary-i386/Packages.gz') + self.check_exists( + 'public/dists/maverick/contrib/binary-i386/Packages.bz2') self.check_exists('public/dists/maverick/contrib/source/Sources') self.check_exists('public/dists/maverick/contrib/source/Sources.gz') self.check_exists('public/dists/maverick/contrib/source/Sources.bz2') @@ -446,20 +494,26 @@ def check(self): self.check_exists('public/pool/main/p/pyspi/pyspi_0.6.1-1.3.dsc') self.check_exists('public/pool/main/p/pyspi/pyspi_0.6.1-1.3.diff.gz') self.check_exists('public/pool/main/p/pyspi/pyspi_0.6.1.orig.tar.gz') - self.check_exists('public/pool/main/b/boost-defaults/libboost-program-options-dev_1.49.0.1_i386.deb') + self.check_exists( + 'public/pool/main/b/boost-defaults/libboost-program-options-dev_1.49.0.1_i386.deb') - self.check_exists('public/pool/contrib/p/pyspi/pyspi_0.6.1-1.3.diff.gz') - self.check_exists('public/pool/contrib/p/pyspi/pyspi_0.6.1.orig.tar.gz') - self.check_exists('public/pool/contrib/p/pyspi/pyspi-0.6.1-1.3.stripped.dsc') + self.check_exists( + 'public/pool/contrib/p/pyspi/pyspi_0.6.1-1.3.diff.gz') + self.check_exists( + 'public/pool/contrib/p/pyspi/pyspi_0.6.1.orig.tar.gz') + self.check_exists( + 'public/pool/contrib/p/pyspi/pyspi-0.6.1-1.3.stripped.dsc') # verify contents except of sums - self.check_file_contents('public/dists/maverick/Release', 'release', match_prepare=strip_processor) + self.check_file_contents( + 'public/dists/maverick/Release', 'release', match_prepare=strip_processor) # verify signatures self.run_cmd([self.gpgFinder.gpg, "--no-auto-check-trustdb", "--keyring", os.path.join(os.path.dirname(inspect.getsourcefile(BaseTest)), "files", "aptly.pub"), "--verify", os.path.join(os.environ["HOME"], ".aptly", 'public/dists/maverick/InRelease')]) self.run_cmd([self.gpgFinder.gpg, "--no-auto-check-trustdb", "--keyring", os.path.join(os.path.dirname(inspect.getsourcefile(BaseTest)), "files", "aptly.pub"), - "--verify", os.path.join(os.environ["HOME"], ".aptly", 'public/dists/maverick/Release.gpg'), + "--verify", os.path.join( + os.environ["HOME"], ".aptly", 'public/dists/maverick/Release.gpg'), os.path.join(os.environ["HOME"], ".aptly", 'public/dists/maverick/Release')]) # verify sums @@ -476,9 +530,11 @@ def check(self): fileSize = int(fileSize) - st = os.stat(os.path.join(os.environ["HOME"], ".aptly", 'public/dists/maverick/', path)) + st = os.stat(os.path.join( + os.environ["HOME"], ".aptly", 'public/dists/maverick/', path)) if fileSize != st.st_size: - raise Exception("file size doesn't match for %s: %d != %d" % (path, fileSize, st.st_size)) + raise Exception("file size doesn't match for %s: %d != %d" % ( + path, fileSize, st.st_size)) if len(fileHash) == 32: h = hashlib.md5() @@ -489,10 +545,12 @@ def check(self): else: h = hashlib.sha512() - h.update(self.read_file(os.path.join('public/dists/maverick', path))) + h.update(self.read_file(os.path.join( + 'public/dists/maverick', path))) if h.hexdigest() != fileHash: - raise Exception("file hash doesn't match for %s: %s != %s" % (path, fileHash, h.hexdigest())) + raise Exception("file hash doesn't match for %s: %s != %s" % ( + path, fileHash, h.hexdigest())) if pathsSeen != set(['main/binary-i386/Packages', 'main/binary-i386/Packages.gz', 'main/binary-i386/Packages.bz2', @@ -616,7 +674,8 @@ class PublishRepo25Test(BaseTest): def check(self): super(PublishRepo25Test, self).check() - self.check_file_contents("public/pool/main/p/pyspi/pyspi_0.6.1.orig.tar.gz", "file") + self.check_file_contents( + "public/pool/main/p/pyspi/pyspi_0.6.1.orig.tar.gz", "file") class PublishRepo26Test(BaseTest): @@ -640,7 +699,8 @@ def check(self): self.run_cmd([self.gpgFinder.gpg, "--no-auto-check-trustdb", "--keyring", os.path.join(os.path.dirname(inspect.getsourcefile(BaseTest)), "files", "aptly_passphrase.pub"), "--verify", os.path.join(os.environ["HOME"], ".aptly", 'public/dists/maverick/InRelease')]) self.run_cmd([self.gpgFinder.gpg, "--no-auto-check-trustdb", "--keyring", os.path.join(os.path.dirname(inspect.getsourcefile(BaseTest)), "files", "aptly_passphrase.pub"), - "--verify", os.path.join(os.environ["HOME"], ".aptly", 'public/dists/maverick/Release.gpg'), + "--verify", os.path.join( + os.environ["HOME"], ".aptly", 'public/dists/maverick/Release.gpg'), os.path.join(os.environ["HOME"], ".aptly", 'public/dists/maverick/Release')]) @@ -665,12 +725,17 @@ def check(self): self.check_exists('public/dists/maverick/main/binary-i386/Release') self.check_exists('public/dists/maverick/main/binary-i386/Packages') self.check_exists('public/dists/maverick/main/binary-i386/Packages.gz') - self.check_exists('public/dists/maverick/main/binary-i386/Packages.bz2') + self.check_exists( + 'public/dists/maverick/main/binary-i386/Packages.bz2') self.check_exists('public/dists/maverick/main/Contents-i386.gz') - self.check_exists('public/dists/maverick/main/debian-installer/binary-i386/Release') - self.check_exists('public/dists/maverick/main/debian-installer/binary-i386/Packages') - self.check_exists('public/dists/maverick/main/debian-installer/binary-i386/Packages.gz') - self.check_exists('public/dists/maverick/main/debian-installer/binary-i386/Packages.bz2') + self.check_exists( + 'public/dists/maverick/main/debian-installer/binary-i386/Release') + self.check_exists( + 'public/dists/maverick/main/debian-installer/binary-i386/Packages') + self.check_exists( + 'public/dists/maverick/main/debian-installer/binary-i386/Packages.gz') + self.check_exists( + 'public/dists/maverick/main/debian-installer/binary-i386/Packages.bz2') self.check_exists('public/dists/maverick/main/Contents-udeb-i386.gz') self.check_exists('public/dists/maverick/main/source/Release') self.check_exists('public/dists/maverick/main/source/Sources') @@ -680,13 +745,18 @@ def check(self): self.check_exists('public/pool/main/p/pyspi/pyspi_0.6.1-1.3.dsc') self.check_exists('public/pool/main/p/pyspi/pyspi_0.6.1-1.3.diff.gz') self.check_exists('public/pool/main/p/pyspi/pyspi_0.6.1.orig.tar.gz') - self.check_exists('public/pool/main/p/pyspi/pyspi-0.6.1-1.3.stripped.dsc') - self.check_exists('public/pool/main/b/boost-defaults/libboost-program-options-dev_1.49.0.1_i386.deb') - self.check_exists('public/pool/main/d/dmraid/dmraid-udeb_1.0.0.rc16-4.1_amd64.udeb') - self.check_exists('public/pool/main/d/dmraid/dmraid-udeb_1.0.0.rc16-4.1_i386.udeb') + self.check_exists( + 'public/pool/main/p/pyspi/pyspi-0.6.1-1.3.stripped.dsc') + self.check_exists( + 'public/pool/main/b/boost-defaults/libboost-program-options-dev_1.49.0.1_i386.deb') + self.check_exists( + 'public/pool/main/d/dmraid/dmraid-udeb_1.0.0.rc16-4.1_amd64.udeb') + self.check_exists( + 'public/pool/main/d/dmraid/dmraid-udeb_1.0.0.rc16-4.1_i386.udeb') # verify contents except of sums - self.check_file_contents('public/dists/maverick/main/debian-installer/binary-i386/Packages', 'udeb_binary', match_prepare=lambda s: "\n".join(sorted(s.split("\n")))) + self.check_file_contents('public/dists/maverick/main/debian-installer/binary-i386/Packages', + 'udeb_binary', match_prepare=lambda s: "\n".join(sorted(s.split("\n")))) class PublishRepo28Test(BaseTest): @@ -707,8 +777,10 @@ def check(self): self.check_exists('public/dists/maverick/main/binary-i386/Release') self.check_not_exists('public/dists/maverick/main/Contents-i386.gz') - self.check_exists('public/dists/maverick/main/debian-installer/binary-i386/Release') - self.check_not_exists('public/dists/maverick/main/Contents-udeb-i386.gz') + self.check_exists( + 'public/dists/maverick/main/debian-installer/binary-i386/Release') + self.check_not_exists( + 'public/dists/maverick/main/Contents-udeb-i386.gz') class PublishRepo29Test(BaseTest): @@ -742,7 +814,8 @@ def check(self): self.run_cmd([self.gpgFinder.gpg, "--no-auto-check-trustdb", "--keyring", os.path.join(os.path.dirname(inspect.getsourcefile(BaseTest)), "files", "aptly.pub"), "--verify", os.path.join(os.environ["HOME"], ".aptly", 'public/dists/maverick/InRelease')]) self.run_cmd([self.gpgFinder.gpg, "--no-auto-check-trustdb", "--keyring", os.path.join(os.path.dirname(inspect.getsourcefile(BaseTest)), "files", "aptly.pub"), - "--verify", os.path.join(os.environ["HOME"], ".aptly", 'public/dists/maverick/Release.gpg'), + "--verify", os.path.join( + os.environ["HOME"], ".aptly", 'public/dists/maverick/Release.gpg'), os.path.join(os.environ["HOME"], ".aptly", 'public/dists/maverick/Release')]) @@ -768,7 +841,8 @@ def check(self): self.run_cmd([self.gpgFinder.gpg, "--no-auto-check-trustdb", "--keyring", os.path.join(os.path.dirname(inspect.getsourcefile(BaseTest)), "files", "aptly_passphrase.pub"), "--verify", os.path.join(os.environ["HOME"], ".aptly", 'public/dists/maverick/InRelease')]) self.run_cmd([self.gpgFinder.gpg, "--no-auto-check-trustdb", "--keyring", os.path.join(os.path.dirname(inspect.getsourcefile(BaseTest)), "files", "aptly_passphrase.pub"), - "--verify", os.path.join(os.environ["HOME"], ".aptly", 'public/dists/maverick/Release.gpg'), + "--verify", os.path.join( + os.environ["HOME"], ".aptly", 'public/dists/maverick/Release.gpg'), os.path.join(os.environ["HOME"], ".aptly", 'public/dists/maverick/Release')]) @@ -791,8 +865,9 @@ def check(self): super(PublishRepo32Test, self).check() # verify signatures - self.run_cmd([self.gpgFinder.gpg, "--no-auto-check-trustdb", "--keyring", os.path.join(os.path.dirname(inspect.getsourcefile(BaseTest)), "files", "aptly_passphrase.pub"), + self.run_cmd([self.gpgFinder.gpg, "--no-auto-check-trustdb", "--keyring", os.path.join(os.path.dirname(inspect.getsourcefile(BaseTest)), "files", "aptly.pub"), "--verify", os.path.join(os.environ["HOME"], ".aptly", 'public/dists/maverick/InRelease')]) - self.run_cmd([self.gpgFinder.gpg, "--no-auto-check-trustdb", "--keyring", os.path.join(os.path.dirname(inspect.getsourcefile(BaseTest)), "files", "aptly_passphrase.pub"), - "--verify", os.path.join(os.environ["HOME"], ".aptly", 'public/dists/maverick/Release.gpg'), + self.run_cmd([self.gpgFinder.gpg, "--no-auto-check-trustdb", "--keyring", os.path.join(os.path.dirname(inspect.getsourcefile(BaseTest)), "files", "aptly.pub"), + "--verify", os.path.join( + os.environ["HOME"], ".aptly", 'public/dists/maverick/Release.gpg'), os.path.join(os.environ["HOME"], ".aptly", 'public/dists/maverick/Release')])