kairos/luet
1
0
Fork 0
mirror of https://github.com/mudler/luet.git synced 2025-09-04 16:50:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adapt artifact tests after delta changes

Browse Source
This commit is contained in:
Ettore Di Giacinto
2021-01-24 19:37:54 +01:00
parent 85b5c96bdd
commit 55d34a3b40
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/compiler/artifact_test.go
View File

@@ -87,7 +87,8 @@ ENV PACKAGE_CATEGORY=app-admin`))
DockerFileName: "Dockerfile", DockerFileName: "Dockerfile",
Destination: filepath.Join(tmpdir2, "output1.tar"), Destination: filepath.Join(tmpdir2, "output1.tar"),
} }
Expect(b.ImageDefinitionToTar(opts)).ToNot(HaveOccurred()) Expect(b.BuildImage(opts)).ToNot(HaveOccurred())
Expect(b.ExportImage(opts)).ToNot(HaveOccurred())
Expect(helpers.Exists(filepath.Join(tmpdir2, "output1.tar"))).To(BeTrue()) Expect(helpers.Exists(filepath.Join(tmpdir2, "output1.tar"))).To(BeTrue())
Expect(b.BuildImage(opts)).ToNot(HaveOccurred()) Expect(b.BuildImage(opts)).ToNot(HaveOccurred())
@@ -110,7 +111,8 @@ RUN echo bar > /test2`))
DockerFileName: "LuetDockerfile", DockerFileName: "LuetDockerfile",
Destination: filepath.Join(tmpdir, "output2.tar"), Destination: filepath.Join(tmpdir, "output2.tar"),
} }
Expect(b.ImageDefinitionToTar(opts2)).ToNot(HaveOccurred()) Expect(b.BuildImage(opts2)).ToNot(HaveOccurred())
Expect(b.ExportImage(opts2)).ToNot(HaveOccurred())
Expect(helpers.Exists(filepath.Join(tmpdir, "output2.tar"))).To(BeTrue()) Expect(helpers.Exists(filepath.Join(tmpdir, "output2.tar"))).To(BeTrue())
diffs, err := b.Changes(opts, opts2) diffs, err := b.Changes(opts, opts2)
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
@@ -127,13 +129,13 @@ RUN echo bar > /test2`))
Expect(diffs).To(Equal( Expect(diffs).To(Equal(
[]ArtifactLayer{{ []ArtifactLayer{{
FromImage: filepath.Join(tmpdir2, "output1.tar"), FromImage: "luet/base",
ToImage: filepath.Join(tmpdir, "output2.tar"), ToImage: "test",
Diffs: ArtifactDiffs{ Diffs: ArtifactDiffs{
Additions: artifacts, Additions: artifacts,
}, },
}})) }}))
err = b.ExtractRootfs(CompilerBackendOptions{SourcePath: filepath.Join(tmpdir, "output2.tar"), Destination: rootfs}, false) err = b.ExtractRootfs(CompilerBackendOptions{ImageName: "test", Destination: rootfs}, false)
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
artifact, err := ExtractArtifactFromDelta(rootfs, filepath.Join(tmpdir, "package.tar"), diffs, 2, false, []string{}, []string{}, None) artifact, err := ExtractArtifactFromDelta(rootfs, filepath.Join(tmpdir, "package.tar"), diffs, 2, false, []string{}, []string{}, None)