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 TestLockedByOthers on Windows #19

Merged
merged 1 commit into from
Jul 21, 2021
Merged

Conversation

djdv
Copy link
Contributor

@djdv djdv commented Jan 25, 2021

This test was failing on Windows since both the value's being checked are not the same ones used on this platform.
Specifically, this causes

errors.As(err, new(fslock.LockedError))

to always be false (on Windows).

The Is check I have in this patch is valid, but currently useless since we'll never receive that concrete value from the lock library.
The string check should catch this error regardless.

I'm going to submit a patch to the lock library and see what they think about wrapping the error value.
We can wait on that and maybe include a dependency update with this PR if it goes through.

@welcome
Copy link

welcome bot commented Jan 25, 2021

Thank you for submitting this PR!
A maintainer will be here shortly to review it.
We are super grateful, but we are also overloaded! Help us by making sure that:

  • The context for this PR is clear, with relevant discussion, decisions
    and stakeholders linked/mentioned.

  • Your contribution itself is clear (code comments, self-review for the
    rest) and in its best form. Follow the code contribution
    guidelines

    if they apply.

Getting other community members to do a review would be great help too on complex PRs (you can ask in the chats/forums). If you are unsure about something, just leave us a comment.
Next steps:

  • A maintainer will triage and assign priority to this PR, commenting on
    any missing things and potentially assigning a reviewer for high
    priority items.

  • The PR gets reviews, discussed and approvals as needed.

  • The PR is merged by maintainers when it has been approved and comments addressed.

We currently aim to provide initial feedback/triaging within two business days. Please keep an eye on any labelling actions, as these will indicate priorities and status of your contribution.
We are very grateful for your contribution!

)

func lockedByOthers(err error) bool {
return errors.Is(err, windows.ERROR_SHARING_VIOLATION) || strings.Contains(err.Error(), "being used by another process")
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Suggested change
return errors.Is(err, windows.ERROR_SHARING_VIOLATION) || strings.Contains(err.Error(), "being used by another process")
return errors.Is(err, windows.ERROR_SHARING_VIOLATION) || strings.Contains(err.Error(), windows.ERROR_SHARING_VIOLATION.Error())

Copy link
Contributor Author

@djdv djdv Jan 25, 2021

Choose a reason for hiding this comment

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

^this pattern should probably be repeated for the other platforms as well.
That is, in the _posix.go file, don't use the equality operator to check syscall error values, instead use errors.Is with them; and call their Error method too.
If the Unix error value on the lefthand of the OR isn't already matched up with the one we expect to receive from lock.Lock we can update it.

As is, I don't think the lefthand condition could ever be true, since Lock (currently) returns a string error, never a syscall.Errno.

@djdv djdv mentioned this pull request Feb 6, 2021
5 tasks
@Stebalien Stebalien marked this pull request as ready for review July 21, 2021 02:22
@Stebalien Stebalien merged commit 3f6957f into ipfs:master Jul 21, 2021
@aschmahmann aschmahmann mentioned this pull request Aug 23, 2021
62 tasks
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