Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
@Naveen-is-here
Naveen-is-here committed May 20, 2024
1 parent 05dc4d9 commit 8aadffa
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 15 deletions.
4 changes: 2 additions & 2 deletions integration/build_flags_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ func testBuildFlags(t *testing.T, context spec.G, it spec.S) {
Eventually(container).Should(
Serve(
SatisfyAll(
ContainSubstring("go1.21.9"),
ContainSubstring("go1.21.10"),
ContainSubstring(`variable value: "some-value"`),
ContainSubstring("/workspace contents: []"),
),
Expand Down Expand Up @@ -123,7 +123,7 @@ func testBuildFlags(t *testing.T, context spec.G, it spec.S) {
Eventually(container).Should(
Serve(
SatisfyAll(
ContainSubstring("go1.21.9"),
ContainSubstring("go1.21.10"),
ContainSubstring(`variable value: "env-value"`),
ContainSubstring("/workspace contents: []"),
),
Expand Down
10 changes: 5 additions & 5 deletions integration/default_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ func testDefault(t *testing.T, context spec.G, it spec.S) {
Eventually(container).Should(
Serve(
SatisfyAll(
ContainSubstring("go1.21.9"),
ContainSubstring("go1.21.10"),
ContainSubstring("/workspace contents: []"),
),
).OnPort(8080),
Expand Down Expand Up @@ -172,7 +172,7 @@ func testDefault(t *testing.T, context spec.G, it spec.S) {
Execute(image.ID)
Expect(err).NotTo(HaveOccurred())

Eventually(container).Should(Serve(ContainSubstring("go1.21.9")).OnPort(8080))
Eventually(container).Should(Serve(ContainSubstring("go1.21.10")).OnPort(8080))
})
})

Expand Down Expand Up @@ -223,7 +223,7 @@ func testDefault(t *testing.T, context spec.G, it spec.S) {
Eventually(container).Should(
Serve(
SatisfyAll(
ContainSubstring("go1.21.9"),
ContainSubstring("go1.21.10"),
ContainSubstring("/workspace contents: []"),
),
).OnPort(8080),
Expand Down Expand Up @@ -283,7 +283,7 @@ func testDefault(t *testing.T, context spec.G, it spec.S) {
Execute(image.ID)
Expect(err).NotTo(HaveOccurred())

Eventually(container).Should(Serve(ContainSubstring("go1.21.9")).OnPort(8080))
Eventually(container).Should(Serve(ContainSubstring("go1.21.10")).OnPort(8080))

Expect(logs).To(ContainLines(
" Assigning launch processes:",
Expand All @@ -299,7 +299,7 @@ func testDefault(t *testing.T, context spec.G, it spec.S) {
Execute(image.ID)
Expect(err).NotTo(HaveOccurred())

Eventually(noReloadContainer).Should(Serve(ContainSubstring("go1.21.9")).OnPort(8080))
Eventually(noReloadContainer).Should(Serve(ContainSubstring("go1.21.10")).OnPort(8080))
})
})
}
2 changes: 1 addition & 1 deletion integration/import_path_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ func testImportPath(t *testing.T, context spec.G, it spec.S) {
Eventually(container).Should(
Serve(
SatisfyAll(
ContainSubstring("go1.21.9"),
ContainSubstring("go1.21.10"),
ContainSubstring("/workspace contents: []"),
),
).OnPort(8080),
Expand Down
2 changes: 1 addition & 1 deletion integration/keep_files_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ func testKeepFiles(t *testing.T, context spec.G, it spec.S) {
Eventually(container).Should(
Serve(
SatisfyAll(
ContainSubstring("go1.21.9"),
ContainSubstring("go1.21.10"),
ContainSubstring("/workspace contents: [/workspace/assets /workspace/static-file]"),
ContainSubstring("file contents: Hello world!"),
),
Expand Down
4 changes: 2 additions & 2 deletions integration/mod_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ func testMod(t *testing.T, context spec.G, it spec.S) {
Execute(image.ID)
Expect(err).NotTo(HaveOccurred())

Eventually(container).Should(Serve(ContainSubstring("go1.21.9")).OnPort(8080))
Eventually(container).Should(Serve(ContainSubstring("go1.21.10")).OnPort(8080))

// check that all required SBOM files are present
Expect(filepath.Join(sbomDir, "sbom", "launch", strings.ReplaceAll(settings.Buildpack.ID, "/", "_"), "targets", "sbom.cdx.json")).To(BeARegularFile())
Expand Down Expand Up @@ -119,7 +119,7 @@ func testMod(t *testing.T, context spec.G, it spec.S) {
Execute(image.ID)
Expect(err).NotTo(HaveOccurred())

Eventually(container).Should(Serve(ContainSubstring("go1.21.9")).OnPort(8080))
Eventually(container).Should(Serve(ContainSubstring("go1.21.10")).OnPort(8080))

// check that all required SBOM files are present
Expect(filepath.Join(sbomDir, "sbom", "launch", strings.ReplaceAll(settings.Buildpack.ID, "/", "_"), "targets", "sbom.cdx.json")).To(BeARegularFile())
Expand Down
4 changes: 2 additions & 2 deletions integration/targets_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ func testTargets(t *testing.T, context spec.G, it spec.S) {
Expect(err).NotTo(HaveOccurred())
containerIDs[container.ID] = struct{}{}

Eventually(container).Should(Serve(ContainSubstring("first: go1.21.9")).OnPort(8080))
Eventually(container).Should(Serve(ContainSubstring("first: go1.21.10")).OnPort(8080))

Expect(logs).To(ContainLines(
" Assigning launch processes:",
Expand All @@ -104,7 +104,7 @@ func testTargets(t *testing.T, context spec.G, it spec.S) {
Expect(err).NotTo(HaveOccurred())
containerIDs[container.ID] = struct{}{}

Eventually(container).Should(Serve(ContainSubstring("second: go1.21.9")).OnPort(8080))
Eventually(container).Should(Serve(ContainSubstring("second: go1.21.10")).OnPort(8080))

// check that all required SBOM files are present
Expect(filepath.Join(sbomDir, "sbom", "launch", strings.ReplaceAll(settings.Buildpack.ID, "/", "_"), "targets", "sbom.cdx.json")).To(BeARegularFile())
Expand Down
4 changes: 2 additions & 2 deletions integration/vendor_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ func testVendor(t *testing.T, context spec.G, it spec.S) {
Execute(image.ID)
Expect(err).NotTo(HaveOccurred())

Eventually(container).Should(Serve(ContainSubstring("go1.21.9")).OnPort(8080))
Eventually(container).Should(Serve(ContainSubstring("go1.21.10")).OnPort(8080))
})
})

Expand Down Expand Up @@ -120,7 +120,7 @@ func testVendor(t *testing.T, context spec.G, it spec.S) {
Execute(image.ID)
Expect(err).NotTo(HaveOccurred())

Eventually(container).Should(Serve(ContainSubstring("go1.21.9")).OnPort(8080))
Eventually(container).Should(Serve(ContainSubstring("go1.21.10")).OnPort(8080))
})
})
}

0 comments on commit 8aadffa

Please sign in to comment.