capability: add/use testInChild helper #173
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Until we add a second test which changes capability (currently we only have one), this can be tested by using e.g Before: [kir@kir-tp1 capability]$ go test -v -count 2 -exec sudo -run TestAmbientCapSet .
=== RUN TestAmbientCapSet
--- PASS: TestAmbientCapSet (0.00s)
=== RUN TestAmbientCapSet
capability_test.go:113: The test needs `CAP_SETPCAP`.
--- SKIP: TestAmbientCapSet (0.00s)
PASS
ok github.com/moby/sys/capability 0.021sAfter: [kir@kir-tp1 capability]$ go test -v -count 2 -exec sudo -run TestAmbientCapSet .
=== RUN TestAmbientCapSet
capability_test.go:147: output from child:
=== RUN TestAmbientCapSet
--- PASS: TestAmbientCapSet (0.00s)
=== RUN TestAmbientCapSet
capability_test.go:147: output from child:
=== RUN TestAmbientCapSet
--- PASS: TestAmbientCapSet (0.00s)
PASS
ok github.com/moby/sys/capability 0.024s |
|
@lifubang can you review this one? |
Houston, we have a problem: $ go test -exec sudo -run AmbientCapSet -count 3 -v === RUN TestAmbientCapSet --- PASS: TestAmbientCapSet (0.00s) === RUN TestAmbientCapSet capability_test.go:113: The test needs `CAP_SETPCAP`. --- SKIP: TestAmbientCapSet (0.00s) === RUN TestAmbientCapSet capability_test.go:113: The test needs `CAP_SETPCAP`. --- SKIP: TestAmbientCapSet (0.00s) PASS ok github.com/moby/sys/capability 0.024s The solution is, tests that manipulate capabilities should be run in a separate process. Add a helper to do just that, and modify TestAmbientCapSet to use it. In particular, the child needs to call os.Exit (which it does directly, in the end, and also indirectly, via log.Fatal). Signed-off-by: Kir Kolyshkin <[email protected]>
|
I have re-reviewed this myself and added some more comments. Since it's just a test case, and this is needed for #171, let's merge it now and [not] regret it later. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Houston, we have a problem:
The solution is, tests that manipulate capabilities should be run in a separate process.
Add a helper to do just that, and modify
TestAmbientCapSetto use it. In particular, the child needs to callos.Exit(which it does directly, in the end, and also indirectly, vialog.Fatal).