From a93ccd410080136803f51c88da216045f29606d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Roth?= Date: Wed, 3 Jul 2024 00:24:00 +0200 Subject: [PATCH] fix tests --- cmd/mirror.go | 4 +-- cmd/mirror_create.go | 2 +- cmd/mirror_edit.go | 4 +-- cmd/mirror_update.go | 4 +-- cmd/repo_include.go | 2 +- deb/remote.go | 10 +++---- deb/remote_test.go | 62 ++++++++++++++++++++++---------------------- 7 files changed, 44 insertions(+), 44 deletions(-) diff --git a/cmd/mirror.go b/cmd/mirror.go index a246d23a..89b19a6c 100644 --- a/cmd/mirror.go +++ b/cmd/mirror.go @@ -10,7 +10,7 @@ import ( func getVerifier(flags *flag.FlagSet) (pgp.Verifier, error) { keyRings := flags.Lookup("keyring").Value.Get().([]string) - ignoreSignatures := context.Config().GpgDisableVerify + ignoreSignatures := context.Config().GpgDisableVerify if context.Flags().IsSet("ignore-signatures") { ignoreSignatures = context.Flags().Lookup("ignore-signatures").Value.Get().(bool) } @@ -20,7 +20,7 @@ func getVerifier(flags *flag.FlagSet) (pgp.Verifier, error) { verifier.AddKeyring(keyRing) } - err := verifier.InitKeyring(ignoreSignatures == false) // be verbose only if verifying signatures is requested + err := verifier.InitKeyring(ignoreSignatures == false) // be verbose only if verifying signatures is requested if err != nil { return nil, err } diff --git a/cmd/mirror_create.go b/cmd/mirror_create.go index 9964e635..022a5cf2 100644 --- a/cmd/mirror_create.go +++ b/cmd/mirror_create.go @@ -20,7 +20,7 @@ func aptlyMirrorCreate(cmd *commander.Command, args []string) error { downloadSources := LookupOption(context.Config().DownloadSourcePackages, context.Flags(), "with-sources") downloadUdebs := context.Flags().Lookup("with-udebs").Value.Get().(bool) downloadInstaller := context.Flags().Lookup("with-installer").Value.Get().(bool) - ignoreSignatures := context.Config().GpgDisableVerify + ignoreSignatures := context.Config().GpgDisableVerify if context.Flags().IsSet("ignore-signatures") { ignoreSignatures = context.Flags().Lookup("ignore-signatures").Value.Get().(bool) } diff --git a/cmd/mirror_edit.go b/cmd/mirror_edit.go index a5d5376c..5adf504b 100644 --- a/cmd/mirror_edit.go +++ b/cmd/mirror_edit.go @@ -28,7 +28,7 @@ func aptlyMirrorEdit(cmd *commander.Command, args []string) error { } fetchMirror := false - ignoreSignatures := context.Config().GpgDisableVerify + ignoreSignatures := context.Config().GpgDisableVerify context.Flags().Visit(func(flag *flag.Flag) { switch flag.Name { case "filter": @@ -45,7 +45,7 @@ func aptlyMirrorEdit(cmd *commander.Command, args []string) error { repo.SetArchiveRoot(flag.Value.String()) fetchMirror = true case "ignore-signatures": - ignoreSignatures = true + ignoreSignatures = true } }) diff --git a/cmd/mirror_update.go b/cmd/mirror_update.go index 504fb6d1..2e6df439 100644 --- a/cmd/mirror_update.go +++ b/cmd/mirror_update.go @@ -42,7 +42,7 @@ func aptlyMirrorUpdate(cmd *commander.Command, args []string) error { } } - ignoreSignatures := context.Config().GpgDisableVerify + ignoreSignatures := context.Config().GpgDisableVerify if context.Flags().IsSet("ignore-signatures") { ignoreSignatures = context.Flags().Lookup("ignore-signatures").Value.Get().(bool) } @@ -59,7 +59,7 @@ func aptlyMirrorUpdate(cmd *commander.Command, args []string) error { } context.Progress().Printf("Downloading & parsing package files...\n") - err = repo.DownloadPackageIndexes(context.Progress(), context.Downloader(), verifier, collectionFactory, ignoreSignatures, ignoreChecksums) + err = repo.DownloadPackageIndexes(context.Progress(), context.Downloader(), verifier, collectionFactory, ignoreSignatures, ignoreChecksums) if err != nil { return fmt.Errorf("unable to update: %s", err) } diff --git a/cmd/repo_include.go b/cmd/repo_include.go index 2e45aec7..72e24c6d 100644 --- a/cmd/repo_include.go +++ b/cmd/repo_include.go @@ -29,7 +29,7 @@ func aptlyRepoInclude(cmd *commander.Command, args []string) error { forceReplace := context.Flags().Lookup("force-replace").Value.Get().(bool) acceptUnsigned := context.Flags().Lookup("accept-unsigned").Value.Get().(bool) - ignoreSignatures := context.Config().GpgDisableVerify + ignoreSignatures := context.Config().GpgDisableVerify if context.Flags().IsSet("ignore-signatures") { ignoreSignatures = context.Flags().Lookup("ignore-signatures").Value.Get().(bool) } diff --git a/deb/remote.go b/deb/remote.go index a13ed93f..6ecb7e80 100644 --- a/deb/remote.go +++ b/deb/remote.go @@ -288,14 +288,14 @@ func (repo *RemoteRepo) Fetch(d aptly.Downloader, verifier pgp.Verifier, ignoreS if err != nil { return err } - if verifier == nil { - return fmt.Errorf("no verifier specified") - } - release, err = verifier.ExtractClearsigned(inrelease) + if verifier == nil { + return fmt.Errorf("no verifier specified") + } + release, err = verifier.ExtractClearsigned(inrelease) if err != nil { return err } - goto ok + goto ok } } else { // 1. try InRelease file diff --git a/deb/remote_test.go b/deb/remote_test.go index 4b55c02b..09208896 100644 --- a/deb/remote_test.go +++ b/deb/remote_test.go @@ -197,7 +197,7 @@ func (s *RemoteRepoSuite) TestPackageURL(c *C) { } func (s *RemoteRepoSuite) TestFetch(c *C) { - err := s.repo.Fetch(s.downloader, nil) + err := s.repo.Fetch(s.downloader, nil, false) c.Assert(err, IsNil) c.Assert(s.repo.Architectures, DeepEquals, []string{"amd64", "armel", "armhf", "i386", "powerpc"}) c.Assert(s.repo.Components, DeepEquals, []string{"main"}) @@ -218,7 +218,7 @@ func (s *RemoteRepoSuite) TestFetchNullVerifier1(c *C) { downloader.ExpectResponse("http://mirror.yandex.ru/debian/dists/squeeze/Release", exampleReleaseFile) downloader.ExpectResponse("http://mirror.yandex.ru/debian/dists/squeeze/Release.gpg", "GPG") - err := s.repo.Fetch(downloader, &NullVerifier{}) + err := s.repo.Fetch(downloader, &NullVerifier{}, true) c.Assert(err, IsNil) c.Assert(s.repo.Architectures, DeepEquals, []string{"amd64", "armel", "armhf", "i386", "powerpc"}) c.Assert(s.repo.Components, DeepEquals, []string{"main"}) @@ -229,7 +229,7 @@ func (s *RemoteRepoSuite) TestFetchNullVerifier2(c *C) { downloader := http.NewFakeDownloader() downloader.ExpectResponse("http://mirror.yandex.ru/debian/dists/squeeze/InRelease", exampleReleaseFile) - err := s.repo.Fetch(downloader, &NullVerifier{}) + err := s.repo.Fetch(downloader, &NullVerifier{}, true) c.Assert(err, IsNil) c.Assert(s.repo.Architectures, DeepEquals, []string{"amd64", "armel", "armhf", "i386", "powerpc"}) c.Assert(s.repo.Components, DeepEquals, []string{"main"}) @@ -238,13 +238,13 @@ func (s *RemoteRepoSuite) TestFetchNullVerifier2(c *C) { func (s *RemoteRepoSuite) TestFetchWrongArchitecture(c *C) { s.repo, _ = NewRemoteRepo("s", "http://mirror.yandex.ru/debian/", "squeeze", []string{"main"}, []string{"xyz"}, false, false, false) - err := s.repo.Fetch(s.downloader, nil) + err := s.repo.Fetch(s.downloader, nil, true) c.Assert(err, ErrorMatches, "architecture xyz not available in repo.*") } func (s *RemoteRepoSuite) TestFetchWrongComponent(c *C) { s.repo, _ = NewRemoteRepo("s", "http://mirror.yandex.ru/debian/", "squeeze", []string{"xyz"}, []string{"i386"}, false, false, false) - err := s.repo.Fetch(s.downloader, nil) + err := s.repo.Fetch(s.downloader, nil, false) c.Assert(err, ErrorMatches, "component xyz not available in repo.*") } @@ -271,14 +271,14 @@ func (s *RemoteRepoSuite) TestRefKey(c *C) { func (s *RemoteRepoSuite) TestDownload(c *C) { s.repo.Architectures = []string{"i386"} - err := s.repo.Fetch(s.downloader, nil) + err := s.repo.Fetch(s.downloader, nil, false) c.Assert(err, IsNil) s.downloader.ExpectError("http://mirror.yandex.ru/debian/dists/squeeze/main/binary-i386/Packages.bz2", &http.Error{Code: 404}) s.downloader.ExpectError("http://mirror.yandex.ru/debian/dists/squeeze/main/binary-i386/Packages.gz", &http.Error{Code: 404}) s.downloader.ExpectResponse("http://mirror.yandex.ru/debian/dists/squeeze/main/binary-i386/Packages", examplePackagesFile) - err = s.repo.DownloadPackageIndexes(s.progress, s.downloader, nil, s.collectionFactory, false) + err = s.repo.DownloadPackageIndexes(s.progress, s.downloader, nil, s.collectionFactory, false, true) c.Assert(err, IsNil) c.Assert(s.downloader.Empty(), Equals, true) @@ -298,14 +298,14 @@ func (s *RemoteRepoSuite) TestDownload(c *C) { // Next call must return an empty download list with option "skip-existing-packages" s.downloader.ExpectResponse("http://mirror.yandex.ru/debian/dists/squeeze/Release", exampleReleaseFile) - err = s.repo.Fetch(s.downloader, nil) + err = s.repo.Fetch(s.downloader, nil, true) c.Assert(err, IsNil) s.downloader.ExpectError("http://mirror.yandex.ru/debian/dists/squeeze/main/binary-i386/Packages.bz2", &http.Error{Code: 404}) s.downloader.ExpectError("http://mirror.yandex.ru/debian/dists/squeeze/main/binary-i386/Packages.gz", &http.Error{Code: 404}) s.downloader.ExpectResponse("http://mirror.yandex.ru/debian/dists/squeeze/main/binary-i386/Packages", examplePackagesFile) - err = s.repo.DownloadPackageIndexes(s.progress, s.downloader, nil, s.collectionFactory, false) + err = s.repo.DownloadPackageIndexes(s.progress, s.downloader, nil, s.collectionFactory, false, true) c.Assert(err, IsNil) c.Assert(s.downloader.Empty(), Equals, true) @@ -319,14 +319,14 @@ func (s *RemoteRepoSuite) TestDownload(c *C) { // Next call must return the download list without option "skip-existing-packages" s.downloader.ExpectResponse("http://mirror.yandex.ru/debian/dists/squeeze/Release", exampleReleaseFile) - err = s.repo.Fetch(s.downloader, nil) + err = s.repo.Fetch(s.downloader, nil, true) c.Assert(err, IsNil) s.downloader.ExpectError("http://mirror.yandex.ru/debian/dists/squeeze/main/binary-i386/Packages.bz2", &http.Error{Code: 404}) s.downloader.ExpectError("http://mirror.yandex.ru/debian/dists/squeeze/main/binary-i386/Packages.gz", &http.Error{Code: 404}) s.downloader.ExpectResponse("http://mirror.yandex.ru/debian/dists/squeeze/main/binary-i386/Packages", examplePackagesFile) - err = s.repo.DownloadPackageIndexes(s.progress, s.downloader, nil, s.collectionFactory, false) + err = s.repo.DownloadPackageIndexes(s.progress, s.downloader, nil, s.collectionFactory, false, true) c.Assert(err, IsNil) c.Assert(s.downloader.Empty(), Equals, true) @@ -344,7 +344,7 @@ func (s *RemoteRepoSuite) TestDownloadWithInstaller(c *C) { s.repo.Architectures = []string{"i386"} s.repo.DownloadInstaller = true - err := s.repo.Fetch(s.downloader, nil) + err := s.repo.Fetch(s.downloader, nil, true) c.Assert(err, IsNil) s.downloader.ExpectError("http://mirror.yandex.ru/debian/dists/squeeze/main/binary-i386/Packages.bz2", &http.Error{Code: 404}) @@ -353,7 +353,7 @@ func (s *RemoteRepoSuite) TestDownloadWithInstaller(c *C) { s.downloader.ExpectResponse("http://mirror.yandex.ru/debian/dists/squeeze/main/installer-i386/current/images/SHA256SUMS", exampleInstallerHashSumFile) s.downloader.ExpectResponse("http://mirror.yandex.ru/debian/dists/squeeze/main/installer-i386/current/images/MANIFEST", exampleInstallerManifestFile) - err = s.repo.DownloadPackageIndexes(s.progress, s.downloader, nil, s.collectionFactory, false) + err = s.repo.DownloadPackageIndexes(s.progress, s.downloader, nil, s.collectionFactory, false, true) c.Assert(err, IsNil) c.Assert(s.downloader.Empty(), Equals, true) @@ -387,7 +387,7 @@ func (s *RemoteRepoSuite) TestDownloadWithSources(c *C) { s.repo.Architectures = []string{"i386"} s.repo.DownloadSources = true - err := s.repo.Fetch(s.downloader, nil) + err := s.repo.Fetch(s.downloader, nil, true) c.Assert(err, IsNil) s.downloader.ExpectError("http://mirror.yandex.ru/debian/dists/squeeze/main/binary-i386/Packages.bz2", &http.Error{Code: 404}) @@ -397,7 +397,7 @@ func (s *RemoteRepoSuite) TestDownloadWithSources(c *C) { s.downloader.ExpectError("http://mirror.yandex.ru/debian/dists/squeeze/main/source/Sources.gz", &http.Error{Code: 404}) s.downloader.ExpectResponse("http://mirror.yandex.ru/debian/dists/squeeze/main/source/Sources", exampleSourcesFile) - err = s.repo.DownloadPackageIndexes(s.progress, s.downloader, nil, s.collectionFactory, false) + err = s.repo.DownloadPackageIndexes(s.progress, s.downloader, nil, s.collectionFactory, false, true) c.Assert(err, IsNil) c.Assert(s.downloader.Empty(), Equals, true) @@ -431,7 +431,7 @@ func (s *RemoteRepoSuite) TestDownloadWithSources(c *C) { // Next call must return an empty download list with option "skip-existing-packages" s.downloader.ExpectResponse("http://mirror.yandex.ru/debian/dists/squeeze/Release", exampleReleaseFile) - err = s.repo.Fetch(s.downloader, nil) + err = s.repo.Fetch(s.downloader, nil, true) c.Assert(err, IsNil) s.downloader.ExpectError("http://mirror.yandex.ru/debian/dists/squeeze/main/binary-i386/Packages.bz2", &http.Error{Code: 404}) @@ -441,7 +441,7 @@ func (s *RemoteRepoSuite) TestDownloadWithSources(c *C) { s.downloader.ExpectError("http://mirror.yandex.ru/debian/dists/squeeze/main/source/Sources.gz", &http.Error{Code: 404}) s.downloader.ExpectResponse("http://mirror.yandex.ru/debian/dists/squeeze/main/source/Sources", exampleSourcesFile) - err = s.repo.DownloadPackageIndexes(s.progress, s.downloader, nil, s.collectionFactory, false) + err = s.repo.DownloadPackageIndexes(s.progress, s.downloader, nil, s.collectionFactory, false, true) c.Assert(err, IsNil) c.Assert(s.downloader.Empty(), Equals, true) @@ -456,7 +456,7 @@ func (s *RemoteRepoSuite) TestDownloadWithSources(c *C) { // Next call must return the download list without option "skip-existing-packages" s.downloader.ExpectResponse("http://mirror.yandex.ru/debian/dists/squeeze/Release", exampleReleaseFile) - err = s.repo.Fetch(s.downloader, nil) + err = s.repo.Fetch(s.downloader, nil, true) c.Assert(err, IsNil) s.downloader.ExpectError("http://mirror.yandex.ru/debian/dists/squeeze/main/binary-i386/Packages.bz2", &http.Error{Code: 404}) @@ -466,7 +466,7 @@ func (s *RemoteRepoSuite) TestDownloadWithSources(c *C) { s.downloader.ExpectError("http://mirror.yandex.ru/debian/dists/squeeze/main/source/Sources.gz", &http.Error{Code: 404}) s.downloader.ExpectResponse("http://mirror.yandex.ru/debian/dists/squeeze/main/source/Sources", exampleSourcesFile) - err = s.repo.DownloadPackageIndexes(s.progress, s.downloader, nil, s.collectionFactory, false) + err = s.repo.DownloadPackageIndexes(s.progress, s.downloader, nil, s.collectionFactory, false, true) c.Assert(err, IsNil) c.Assert(s.downloader.Empty(), Equals, true) @@ -487,10 +487,10 @@ func (s *RemoteRepoSuite) TestDownloadFlat(c *C) { downloader.ExpectError("http://repos.express42.com/virool/precise/Packages.xz", &http.Error{Code: 404}) downloader.ExpectResponse("http://repos.express42.com/virool/precise/Packages", examplePackagesFile) - err := s.flat.Fetch(downloader, nil) + err := s.flat.Fetch(downloader, nil, true) c.Assert(err, IsNil) - err = s.flat.DownloadPackageIndexes(s.progress, downloader, nil, s.collectionFactory, true) + err = s.flat.DownloadPackageIndexes(s.progress, downloader, nil, s.collectionFactory, true, true) c.Assert(err, IsNil) c.Assert(downloader.Empty(), Equals, true) @@ -515,10 +515,10 @@ func (s *RemoteRepoSuite) TestDownloadFlat(c *C) { downloader.ExpectError("http://repos.express42.com/virool/precise/Packages.xz", &http.Error{Code: 404}) downloader.ExpectResponse("http://repos.express42.com/virool/precise/Packages", examplePackagesFile) - err = s.flat.Fetch(downloader, nil) + err = s.flat.Fetch(downloader, nil, true) c.Assert(err, IsNil) - err = s.flat.DownloadPackageIndexes(s.progress, downloader, nil, s.collectionFactory, true) + err = s.flat.DownloadPackageIndexes(s.progress, downloader, nil, s.collectionFactory, true, true) c.Assert(err, IsNil) c.Assert(downloader.Empty(), Equals, true) @@ -537,10 +537,10 @@ func (s *RemoteRepoSuite) TestDownloadFlat(c *C) { downloader.ExpectError("http://repos.express42.com/virool/precise/Packages.xz", &http.Error{Code: 404}) downloader.ExpectResponse("http://repos.express42.com/virool/precise/Packages", examplePackagesFile) - err = s.flat.Fetch(downloader, nil) + err = s.flat.Fetch(downloader, nil, true) c.Assert(err, IsNil) - err = s.flat.DownloadPackageIndexes(s.progress, downloader, nil, s.collectionFactory, true) + err = s.flat.DownloadPackageIndexes(s.progress, downloader, nil, s.collectionFactory, true, true) c.Assert(err, IsNil) c.Assert(downloader.Empty(), Equals, true) @@ -568,10 +568,10 @@ func (s *RemoteRepoSuite) TestDownloadWithSourcesFlat(c *C) { downloader.ExpectError("http://repos.express42.com/virool/precise/Sources.xz", &http.Error{Code: 404}) downloader.ExpectResponse("http://repos.express42.com/virool/precise/Sources", exampleSourcesFile) - err := s.flat.Fetch(downloader, nil) + err := s.flat.Fetch(downloader, nil, true) c.Assert(err, IsNil) - err = s.flat.DownloadPackageIndexes(s.progress, downloader, nil, s.collectionFactory, true) + err = s.flat.DownloadPackageIndexes(s.progress, downloader, nil, s.collectionFactory, true, true) c.Assert(err, IsNil) c.Assert(downloader.Empty(), Equals, true) @@ -614,10 +614,10 @@ func (s *RemoteRepoSuite) TestDownloadWithSourcesFlat(c *C) { downloader.ExpectError("http://repos.express42.com/virool/precise/Sources.xz", &http.Error{Code: 404}) downloader.ExpectResponse("http://repos.express42.com/virool/precise/Sources", exampleSourcesFile) - err = s.flat.Fetch(downloader, nil) + err = s.flat.Fetch(downloader, nil, true) c.Assert(err, IsNil) - err = s.flat.DownloadPackageIndexes(s.progress, downloader, nil, s.collectionFactory, true) + err = s.flat.DownloadPackageIndexes(s.progress, downloader, nil, s.collectionFactory, true, true) c.Assert(err, IsNil) c.Assert(downloader.Empty(), Equals, true) @@ -640,10 +640,10 @@ func (s *RemoteRepoSuite) TestDownloadWithSourcesFlat(c *C) { downloader.ExpectError("http://repos.express42.com/virool/precise/Sources.xz", &http.Error{Code: 404}) downloader.ExpectResponse("http://repos.express42.com/virool/precise/Sources", exampleSourcesFile) - err = s.flat.Fetch(downloader, nil) + err = s.flat.Fetch(downloader, nil, true) c.Assert(err, IsNil) - err = s.flat.DownloadPackageIndexes(s.progress, downloader, nil, s.collectionFactory, true) + err = s.flat.DownloadPackageIndexes(s.progress, downloader, nil, s.collectionFactory, true, true) c.Assert(err, IsNil) c.Assert(downloader.Empty(), Equals, true)