Skip to content

Remove leftover merge conflict markers from unit tests - #379

Merged
tylerreckart merged 1 commit into
mainfrom
fix/unit-test-conflict-markers
Sep 21, 2026
Merged

Remove leftover merge conflict markers from unit tests#379
tylerreckart merged 1 commit into
mainfrom
fix/unit-test-conflict-markers

Conversation

@tylerreckart

@tylerreckart tylerreckart commented Sep 21, 2026

Copy link
Copy Markdown
Owner

Summary

  • #358 and #325 squash-merged unresolved <<<<<<< blocks into tests/test_schedule_parser.cpp and tests/test_sandbox_ssrf.cpp, so a clean main build failed at compile time.
  • Keep both schedule-parser subcases (year-1 fail-closed and impossible/leap dates) and keep the deterministic read_check_hook sandbox TOCTOU test.

Test plan

  • unit_schedule_parser compiles and passes
  • unit_sandbox_ssrf compiles and passes
  • CI unit tests on this PR

Made with Cursor

@tylerreckart @cursoragent
Remove leftover merge conflict markers from unit tests.
cece7ed 
#358 and #325 squash-merged unresolved conflict blocks into the
schedule parser and sandbox SSRF tests, so a clean main build failed
at compile time.

Co-authored-by: Cursor <cursoragent@cursor.com>
@tylerreckart
tylerreckart merged commit b2f700e into main Sep 21, 2026
1 of 5 checks passed
@tylerreckart
tylerreckart deleted the fix/unit-test-conflict-markers branch September 21, 2026 13:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@tylerreckart