remove pkg/testutil/loopback_linux.go and use continuity/testutil/loopback#2694
Merged
dmcgowan merged 1 commit intocontainerd:masterfrom Oct 2, 2018
Merged
Conversation
AkihiroSuda
force-pushed
the
continuity-testutil
branch
2 times, most recently
from
a72cf6f to
60fdfbd
Compare
AkihiroSuda
added a commit
to AkihiroSuda/continuity
that referenced
this pull request
Oct 1, 2018
containerd/containerd#2694 is going to import both `containerd/pkg/testutil` and `continuity/testutil` for deduplicating `NewLoopback()`. However, as the both pkg defines `test.root` BoolVar in `init()`, the test panics. This commit avoids the panic issue by splitting `continuity/testutil/loopback_linux.go` to another pkg (`continuity/testutil/loopback`), so taht containerd does not need to import both `containerd/pkg/testutil` and `continuity/testutil`. i.e. containerd will import `containerd/pkg/testutil` and `continuity/testutil/loopback`. Signed-off-by: Akihiro Suda <[email protected]>
Member
Author
|
Needs containerd/continuity#136 to be merged (EDIT: done)
|
AkihiroSuda
force-pushed
the
continuity-testutil
branch
from
60fdfbd to
2c31db0
Compare
AkihiroSuda
changed the title
AkihiroSuda
force-pushed
the
continuity-testutil
branch
from
2c31db0 to
73c3ad4
Compare
…pback Signed-off-by: Akihiro Suda <[email protected]>
AkihiroSuda
force-pushed
the
continuity-testutil
branch
from
73c3ad4 to
5349fa3
Compare
Codecov Report
@@ Coverage Diff @@
## master #2694 +/- ##
=========================================
+ Coverage 43.07% 43.2% +0.12%
=========================================
Files 100 100
Lines 10606 10606
=========================================
+ Hits 4569 4582 +13
+ Misses 5316 5301 -15
- Partials 721 723 +2
Continue to review full report at Codecov.
|
Member
|
LGTM |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Signed-off-by: Akihiro Suda [email protected]