Skip to content

Commit

Permalink
Adapt expectations of integration tests
Browse files Browse the repository at this point in the history
  • Loading branch information
c0d1ngm0nk3y authored and mhdawson committed Jun 20, 2024
1 parent 7b1dd65 commit b704495
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion integration/caching_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ func testCaching(t *testing.T, context spec.G, it spec.S) {
extenderBuildStr+" Configuring launch environment",
extenderBuildStr+" NODE_PROJECT_PATH -> \"/workspace\"",
extenderBuildStr+" NPM_CONFIG_LOGLEVEL -> \"error\"",
fmt.Sprintf(extenderBuildStr+" PATH -> \"$PATH:/layers/%s/launch-modules/node_modules/.bin\"", strings.ReplaceAll(settings.Buildpack.ID, "/", "_")),
fmt.Sprintf(extenderBuildStr+" PATH -> \"/layers/%s/launch-modules/node_modules/.bin:$PATH\"", strings.ReplaceAll(settings.Buildpack.ID, "/", "_")),
extenderBuildStr+"",
))

Expand Down
6 changes: 3 additions & 3 deletions integration/logging_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ func testLogging(t *testing.T, context spec.G, it spec.S) {
extenderBuildStr+" Configuring launch environment",
extenderBuildStr+" NODE_PROJECT_PATH -> \"/workspace\"",
extenderBuildStr+" NPM_CONFIG_LOGLEVEL -> \"error\"",
fmt.Sprintf(extenderBuildStr+" PATH -> \"$PATH:/layers/%s/launch-modules/node_modules/.bin\"", strings.ReplaceAll(settings.Buildpack.ID, "/", "_")),
fmt.Sprintf(extenderBuildStr+" PATH -> \"/layers/%s/launch-modules/node_modules/.bin:$PATH\"", strings.ReplaceAll(settings.Buildpack.ID, "/", "_")),
))
})

Expand Down Expand Up @@ -140,7 +140,7 @@ func testLogging(t *testing.T, context spec.G, it spec.S) {
Expect(logs).To(ContainLines(
extenderBuildStr+" Configuring build environment",
extenderBuildStr+" NODE_ENV -> \"development\"",
fmt.Sprintf(extenderBuildStr+" PATH -> \"$PATH:/layers/%s/build-modules/node_modules/.bin\"", strings.ReplaceAll(settings.Buildpack.ID, "/", "_")),
fmt.Sprintf(extenderBuildStr+" PATH -> \"/layers/%s/build-modules/node_modules/.bin:$PATH\"", strings.ReplaceAll(settings.Buildpack.ID, "/", "_")),
extenderBuildStr+"",
fmt.Sprintf(extenderBuildStr+` Generating SBOM for /layers/%s/build-modules`, strings.ReplaceAll(settings.Buildpack.ID, "/", "_")),
MatchRegexp(extenderBuildStrEscaped+` Completed in (\d+)(\.\d+)?(ms|s)`),
Expand All @@ -153,7 +153,7 @@ func testLogging(t *testing.T, context spec.G, it spec.S) {
extenderBuildStr+" Configuring launch environment",
extenderBuildStr+" NODE_PROJECT_PATH -> \"/workspace\"",
extenderBuildStr+" NPM_CONFIG_LOGLEVEL -> \"error\"",
fmt.Sprintf(extenderBuildStr+" PATH -> \"$PATH:/layers/%s/launch-modules/node_modules/.bin\"", strings.ReplaceAll(settings.Buildpack.ID, "/", "_")),
fmt.Sprintf(extenderBuildStr+" PATH -> \"/layers/%s/launch-modules/node_modules/.bin:$PATH\"", strings.ReplaceAll(settings.Buildpack.ID, "/", "_")),
extenderBuildStr+"",
fmt.Sprintf(extenderBuildStr+` Generating SBOM for /layers/%s/launch-modules`, strings.ReplaceAll(settings.Buildpack.ID, "/", "_")),
MatchRegexp(extenderBuildStrEscaped+` Completed in (\d+)(\.\d+)?(ms|s)`),
Expand Down
2 changes: 1 addition & 1 deletion integration/native_modules_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ func testNativeModules(t *testing.T, context spec.G, it spec.S) {
extenderBuildStr+" Configuring launch environment",
extenderBuildStr+" NODE_PROJECT_PATH -> \"/workspace\"",
extenderBuildStr+" NPM_CONFIG_LOGLEVEL -> \"error\"",
fmt.Sprintf(extenderBuildStr+" PATH -> \"$PATH:/layers/%s/launch-modules/node_modules/.bin\"", strings.ReplaceAll(settings.Buildpack.ID, "/", "_")),
fmt.Sprintf(extenderBuildStr+" PATH -> \"/layers/%s/launch-modules/node_modules/.bin:$PATH\"", strings.ReplaceAll(settings.Buildpack.ID, "/", "_")),
extenderBuildStr+"",
))
})
Expand Down
2 changes: 1 addition & 1 deletion integration/vendored_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ func testVendored(t *testing.T, context spec.G, it spec.S) {
extenderBuildStr+" Configuring launch environment",
extenderBuildStr+" NODE_PROJECT_PATH -> \"/workspace\"",
extenderBuildStr+" NPM_CONFIG_LOGLEVEL -> \"error\"",
fmt.Sprintf(extenderBuildStr+" PATH -> \"$PATH:/layers/%s/launch-modules/node_modules/.bin\"", strings.ReplaceAll(settings.Buildpack.ID, "/", "_")),
fmt.Sprintf(extenderBuildStr+" PATH -> \"/layers/%s/launch-modules/node_modules/.bin:$PATH\"", strings.ReplaceAll(settings.Buildpack.ID, "/", "_")),
extenderBuildStr+"",
))
})
Expand Down

0 comments on commit b704495

Please sign in to comment.