Skip to content

vendor: github.com/moby/sys/mount v0.3.0, mountinfo v0.5.0, signal v0.6.0, symlink v0.2.0#42980

Merged
thaJeztah merged 2 commits intomoby:masterfrom
thaJeztah:bump_sys
Nov 19, 2021
Merged

vendor: github.com/moby/sys/mount v0.3.0, mountinfo v0.5.0, signal v0.6.0, symlink v0.2.0#42980
thaJeztah merged 2 commits intomoby:masterfrom
thaJeztah:bump_sys

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

@thaJeztah thaJeztah commented Nov 1, 2021

vendor: golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359

full diff: golang/sys@63515b4...69cdffd

vendor: github.com/moby/sys/mount v0.3.0, mountinfo v0.5.0, signal v0.6.0, symlink v0.2.0

full diff: moby/sys@signal/v0.5.0...signal/v0.6.0

Modules:

  • github.com/moby/sys/mount v0.3.0
  • github.com/moby/sys/mountinfo v0.5.0
  • github.com/moby/sys/signal v0.6.0
  • github.com/moby/sys/symlink v0.2.0

@thaJeztah
Copy link
Copy Markdown
Member Author

CI is happy with this update (besides the Jenkins workspace cleanup, but that's a known issue)

We can look into adding more code to change the error handling, but at least all tests still pass

@thaJeztah thaJeztah changed the title vendor: update github.com/moby/sys vendor: github.com/moby/sys/mount v0.3.0, mountinfo v0.5.0, signal v0.6.0, symlink v0.2.0 Nov 12, 2021
@thaJeztah thaJeztah marked this pull request as ready for review November 12, 2021 14:43
Copy link
Copy Markdown
Member

@cpuguy83 cpuguy83 left a comment

Choose a reason for hiding this comment

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

LGTM

Comment thread integration/container/kill_test.go Outdated
err := client.ContainerKill(ctx, id, "0")
assert.Error(t, err, "Error response from daemon: Invalid signal: 0")
assert.ErrorContains(t, err, "Error response from daemon:")
assert.ErrorContains(t, err, "nvalid signal: 0")
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Should this be "nvalid" or "invalid"?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

ah, so this was a little hack; the update has some linting fixes, one of them is "errors should not be capitalised or contain interpunction" so it changed from Invalid signal to invalid signal. Tried to keep it "portable" without doing a string.ToLower(). Probably not strictly needed (in case we wanted to run the integration tests against different daemon versions, but I guess we won't be doing that)

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

That'd be worth a comment if you're inclined to make a minor fix here.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

I rebased, and added a comment 👍

….6.0, symlink v0.2.0

full diff: moby/sys@signal/v0.5.0...signal/v0.6.0

Modules:

- github.com/moby/sys/mount v0.3.0
- github.com/moby/sys/mountinfo v0.5.0
- github.com/moby/sys/signal v0.6.0
- github.com/moby/sys/symlink v0.2.0

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
Copy link
Copy Markdown
Member Author

Failure on Windows is unrelated (known flaky test)

=== RUN   TestNetworkDBCRUDTableEntries
    networkdb_test.go:310: Entry existence verification test failed for node2(7e847e7fa01d)
2021/11/19 09:12:48 Closing DB instances...
--- FAIL: TestNetworkDBCRUDTableEntries (7.63s)

@thaJeztah
Copy link
Copy Markdown
Member Author

let me bring this one in

@thaJeztah thaJeztah merged commit f06314f into moby:master Nov 19, 2021
@thaJeztah thaJeztah deleted the bump_sys branch November 19, 2021 12:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants