Git conflict markers in tests

Question

Git conflict markers in tests

k-sareen opened this issue 9 months ago · 4 comments

Hello! Been a while. Just pulled master today and I saw this commit that seemed to check in the git conflict markers into test files here and here? I presume that was a mistake.

I'm not sure why the test script doesn't die?

Answer 1 · 2024-03-26T00:33:43.000Z

Ah, shoot. I had a merge rebase issue and thought I had fixed that. Yeah, somehow the unit tests don't fail the CI; similar issue to parser failures not generating a non-zero exit code. I'll fix the conflict markers in a sec.

Answer 2 · 2024-03-26T02:12:23.000Z

CI is just piggy-backing off test/all.bash so the underlying issue is likely there.

Answer 3 · 2024-03-26T02:17:39.000Z

Also 44bda5f only fixed one file. This file still has the markers checked in.

Answer 4 · 2024-03-28T17:45:14.000Z

Going to close this; probably should be a separate issue for the unit tests not failing CI.