Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(fsx): recursive merging edge cases #709

Merged
merged 3 commits into from
Aug 3, 2023
Merged

fix(fsx): recursive merging edge cases #709

merged 3 commits into from
Aug 3, 2023

Conversation

zepatrik
Copy link
Member

@zepatrik zepatrik commented Aug 2, 2023

No description provided.

Comment on lines 48 to 102
assert.Error(t, fstest.TestFS(
mergefs.Merge(a, b),
"a",
"b",
"dir",
"dir/c",
"dir/d",
))

assert.NoError(t, fstest.TestFS(m, "a", "b", "dir", "dir/c", "dir/d"))
assert.Error(t, fstest.TestFS(
mergefs.Merge(mergefs.Merge(a, b), x),
"a",
"b",
"dir",
"dir/c",
"dir/d",
"dir/y",
"x",
))
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It took me way too long to see that this was not our code, but the other lib 🤦

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And it took me way too long to see you changed assert.NoError to assert.Error while I was trying to understand how you magically made the tests pass for laher/mergefs also 🤦

@zepatrik zepatrik requested a review from alnr August 2, 2023 14:29
@alnr
Copy link
Contributor

alnr commented Aug 3, 2023

Thank you! Added more test cases.

@alnr alnr merged commit 19829a9 into master Aug 3, 2023
6 checks passed
@alnr alnr deleted the merge-test branch August 3, 2023 08:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants