From 41062d2fcc93db60e65381a6492fb98f3978f0d8 Mon Sep 17 00:00:00 2001 From: Nathan Rijksen Date: Tue, 12 Nov 2024 14:24:57 -0800 Subject: [PATCH] Fix TestRealWorld --- internal/runbits/buildscript/buildscript_test.go | 4 ++-- internal/runbits/buildscript/testdata/buildscript1.as | 2 +- internal/runbits/buildscript/testdata/buildscript2.as | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/runbits/buildscript/buildscript_test.go b/internal/runbits/buildscript/buildscript_test.go index 60190339ee..8f201e2814 100644 --- a/internal/runbits/buildscript/buildscript_test.go +++ b/internal/runbits/buildscript/buildscript_test.go @@ -85,10 +85,10 @@ func TestRealWorld(t *testing.T) { "```\n"+ "<<<<<<< local\n"+ "Project: https://platform.activestate.com/ActiveState-CLI/Merge?branch=main&commitID=d908a758-6a81-40d4-b0eb-87069cd7f07d\n"+ - "Time: 2024-05-10T00:00:13.138Z\n"+ + "Time: 2024-05-10T00:00:13Z\n"+ "=======\n"+ "Project: https://platform.activestate.com/ActiveState-CLI/Merge?branch=main&commitID=f3263ee4-ac4c-41ee-b778-2585333f49f7\n"+ - "Time: 2023-08-01T16:20:11.985Z\n"+ + "Time: 2023-08-01T16:20:11Z\n"+ ">>>>>>> remote\n"+ "```\n"+` runtime = state_tool_artifacts_v1( diff --git a/internal/runbits/buildscript/testdata/buildscript1.as b/internal/runbits/buildscript/testdata/buildscript1.as index 1d33f4566e..9ed3f42adc 100644 --- a/internal/runbits/buildscript/testdata/buildscript1.as +++ b/internal/runbits/buildscript/testdata/buildscript1.as @@ -1,6 +1,6 @@ ``` Project: https://platform.activestate.com/ActiveState-CLI/Merge?branch=main&commitID=d908a758-6a81-40d4-b0eb-87069cd7f07d -Time: 2024-05-10T00:00:13.138Z +Time: 2024-05-10T00:00:13Z ``` runtime = state_tool_artifacts_v1( diff --git a/internal/runbits/buildscript/testdata/buildscript2.as b/internal/runbits/buildscript/testdata/buildscript2.as index 2fe6441d1d..8e1458918c 100644 --- a/internal/runbits/buildscript/testdata/buildscript2.as +++ b/internal/runbits/buildscript/testdata/buildscript2.as @@ -1,6 +1,6 @@ ``` Project: https://platform.activestate.com/ActiveState-CLI/Merge?branch=main&commitID=f3263ee4-ac4c-41ee-b778-2585333f49f7 -Time: 2023-08-01T16:20:11.985000Z +Time: 2023-08-01T16:20:11Z ``` runtime = state_tool_artifacts_v1(