diff --git a/pkg/installer/installer_test.go b/pkg/installer/installer_test.go index a95d6458..7e4de3ae 100644 --- a/pkg/installer/installer_test.go +++ b/pkg/installer/installer_test.go @@ -86,12 +86,14 @@ var _ = Describe("Installer", func() { Expect(err).ToNot(HaveOccurred()) Expect(repo.GetName()).To(Equal("test")) Expect(helpers.Exists(spec.Rel("repository.yaml"))).ToNot(BeTrue()) - Expect(helpers.Exists(spec.Rel(TREE_TARBALL))).ToNot(BeTrue()) + Expect(helpers.Exists(spec.Rel(TREE_TARBALL + ".gz"))).ToNot(BeTrue()) + Expect(helpers.Exists(spec.Rel(REPOSITORY_METAFILE + ".tar"))).ToNot(BeTrue()) err = repo.Write(tmpdir, false) Expect(err).ToNot(HaveOccurred()) Expect(helpers.Exists(spec.Rel("repository.yaml"))).To(BeTrue()) - Expect(helpers.Exists(spec.Rel(TREE_TARBALL))).To(BeTrue()) + Expect(helpers.Exists(spec.Rel(TREE_TARBALL + ".gz"))).To(BeTrue()) + Expect(helpers.Exists(spec.Rel(REPOSITORY_METAFILE + ".tar"))).To(BeTrue()) Expect(repo.GetUrls()[0]).To(Equal(tmpdir)) Expect(repo.GetType()).To(Equal("disk")) @@ -199,12 +201,12 @@ urls: Expect(err).ToNot(HaveOccurred()) Expect(repo.GetName()).To(Equal("test")) Expect(helpers.Exists(spec.Rel("repository.yaml"))).ToNot(BeTrue()) - Expect(helpers.Exists(spec.Rel(TREE_TARBALL))).ToNot(BeTrue()) + Expect(helpers.Exists(spec.Rel(TREE_TARBALL + ".gz"))).ToNot(BeTrue()) err = repo.Write(tmpdir, false) Expect(err).ToNot(HaveOccurred()) Expect(helpers.Exists(spec.Rel("repository.yaml"))).To(BeTrue()) - Expect(helpers.Exists(spec.Rel(TREE_TARBALL))).To(BeTrue()) + Expect(helpers.Exists(spec.Rel(TREE_TARBALL + ".gz"))).To(BeTrue()) Expect(repo.GetUrls()[0]).To(Equal(tmpdir)) Expect(repo.GetType()).To(Equal("disk")) @@ -307,12 +309,12 @@ urls: Expect(err).ToNot(HaveOccurred()) Expect(repo.GetName()).To(Equal("test")) Expect(helpers.Exists(spec.Rel("repository.yaml"))).ToNot(BeTrue()) - Expect(helpers.Exists(spec.Rel(TREE_TARBALL))).ToNot(BeTrue()) + Expect(helpers.Exists(spec.Rel(TREE_TARBALL + ".gz"))).ToNot(BeTrue()) err = repo.Write(tmpdir, false) Expect(err).ToNot(HaveOccurred()) Expect(helpers.Exists(spec.Rel("repository.yaml"))).To(BeTrue()) - Expect(helpers.Exists(spec.Rel(TREE_TARBALL))).To(BeTrue()) + Expect(helpers.Exists(spec.Rel(TREE_TARBALL + ".gz"))).To(BeTrue()) Expect(repo.GetUrls()[0]).To(Equal(tmpdir)) Expect(repo.GetType()).To(Equal("disk")) @@ -420,14 +422,14 @@ urls: Expect(err).ToNot(HaveOccurred()) Expect(repo.GetName()).To(Equal("test")) Expect(helpers.Exists(spec.Rel("repository.yaml"))).ToNot(BeTrue()) - Expect(helpers.Exists(spec.Rel(TREE_TARBALL))).ToNot(BeTrue()) + Expect(helpers.Exists(spec.Rel(TREE_TARBALL + ".gz"))).ToNot(BeTrue()) err = repo.Write(tmpdir, false) Expect(err).ToNot(HaveOccurred()) Expect(helpers.Exists(spec.Rel("b-test-1.1.package.tar.gz"))).To(BeTrue()) Expect(helpers.Exists(spec.Rel("b-test-1.1.package.tar"))).ToNot(BeTrue()) Expect(helpers.Exists(spec.Rel("repository.yaml"))).To(BeTrue()) - Expect(helpers.Exists(spec.Rel(TREE_TARBALL))).To(BeTrue()) + Expect(helpers.Exists(spec.Rel(TREE_TARBALL + ".gz"))).To(BeTrue()) Expect(repo.GetUrls()[0]).To(Equal(tmpdir)) Expect(repo.GetType()).To(Equal("disk")) diff --git a/pkg/installer/repository_test.go b/pkg/installer/repository_test.go index 403d5046..36bd9e1e 100644 --- a/pkg/installer/repository_test.go +++ b/pkg/installer/repository_test.go @@ -86,12 +86,12 @@ var _ = Describe("Repository", func() { Expect(err).ToNot(HaveOccurred()) Expect(repo.GetName()).To(Equal("test")) Expect(helpers.Exists(spec.Rel(REPOSITORY_SPECFILE))).ToNot(BeTrue()) - Expect(helpers.Exists(spec.Rel(TREE_TARBALL))).ToNot(BeTrue()) + Expect(helpers.Exists(spec.Rel(TREE_TARBALL + ".gz"))).ToNot(BeTrue()) err = repo.Write(tmpdir, false) Expect(err).ToNot(HaveOccurred()) Expect(helpers.Exists(spec.Rel(REPOSITORY_SPECFILE))).To(BeTrue()) - Expect(helpers.Exists(spec.Rel(TREE_TARBALL))).To(BeTrue()) + Expect(helpers.Exists(spec.Rel(TREE_TARBALL + ".gz"))).To(BeTrue()) }) }) Context("Matching packages", func() {