Skip to content

Commit

Permalink
Fix TestRealWorld
Browse files Browse the repository at this point in the history
  • Loading branch information
Naatan committed Nov 12, 2024
1 parent 5d70309 commit 41062d2
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions internal/runbits/buildscript/buildscript_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion internal/runbits/buildscript/testdata/buildscript1.as
Original file line number Diff line number Diff line change
@@ -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(
Expand Down
2 changes: 1 addition & 1 deletion internal/runbits/buildscript/testdata/buildscript2.as
Original file line number Diff line number Diff line change
@@ -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(
Expand Down

0 comments on commit 41062d2

Please sign in to comment.