Make logging integration test less fragile

paketo-buildpacks · Jun 20, 2024 · edc677a · edc677a
1 parent b704495
commit edc677a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/integration/caching_test.go b/integration/caching_test.go
@@ -168,7 +168,7 @@ func testCaching(t *testing.T, context spec.G, it spec.S) {
 				extenderBuildStr+"  Executing launch environment install process",
 				fmt.Sprintf(extenderBuildStr+"    Running 'npm ci --unsafe-perm --cache /layers/%s/npm-cache'", strings.ReplaceAll(settings.Buildpack.ID, "/", "_")),
 			))
-			Expect(logs).To(ContainLines(MatchRegexp(extenderBuildStrEscaped + `      Completed in (\d+\.\d+|\d{3})`)))
+			Expect(logs).To(ContainLines(MatchRegexp(extenderBuildStrEscaped + `      Completed in (\d+)(\.\d+)?(ms|s)`)))
 			Expect(logs).To(ContainLines(
 				extenderBuildStr+"  Configuring launch environment",
 				extenderBuildStr+"    NODE_PROJECT_PATH   -> \"/workspace\"",

diff --git a/integration/logging_test.go b/integration/logging_test.go
@@ -91,7 +91,7 @@ func testLogging(t *testing.T, context spec.G, it spec.S) {
 				fmt.Sprintf(extenderBuildStr+"    Running 'npm install --unsafe-perm --cache /layers/%s/npm-cache'", strings.ReplaceAll(settings.Buildpack.ID, "/", "_")),
 			))
 			Expect(logs).To(ContainLines(
-				MatchRegexp(extenderBuildStrEscaped + `      Completed in (\d+\.\d+|\d{3})`),
+				MatchRegexp(extenderBuildStrEscaped + `      Completed in (\d+)(\.\d+)?(ms|s)`),
 			))
 			Expect(logs).To(ContainLines(
 				extenderBuildStr+"  Configuring launch environment",
@@ -135,7 +135,7 @@ func testLogging(t *testing.T, context spec.G, it spec.S) {
 					fmt.Sprintf(extenderBuildStr+"    Running 'npm install --unsafe-perm --cache /layers/%s/npm-cache'", strings.ReplaceAll(settings.Buildpack.ID, "/", "_")),
 				))
 				Expect(logs).To(ContainLines(
-					MatchRegexp(extenderBuildStrEscaped + `      Completed in (\d+\.\d+|\d{3})`),
+					MatchRegexp(extenderBuildStrEscaped + `      Completed in (\d+)(\.\d+)?(ms|s)`),
 				))
 				Expect(logs).To(ContainLines(
 					extenderBuildStr+"  Configuring build environment",