test: add test for different volume sources #1553
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
shaloulcy
force-pushed
the
volume_from_test
branch
4 times, most recently
from
fdf0d97 to
27f0e6b
Compare
Codecov Report
@@ Coverage Diff @@
## master #1553 +/- ##
==========================================
- Coverage 41.3% 39.98% -1.33%
==========================================
Files 267 267
Lines 17331 17975 +644
==========================================
+ Hits 7159 7187 +28
- Misses 9282 9898 +616
Partials 890 890
|
Letty5411
reviewed
Jun 20, 2018
test/cli_run_volume_test.go
Outdated
| DelContainerForceMultyTime(c, containerName1) | ||
| DelContainerForceMultyTime(c, containerName2) | ||
| RemoveVolume(c, volumeName1) | ||
| command.PouchRun("rmi", "-f", imageWithVolume).Assert(c, icmd.Success) |
There was a problem hiding this comment.
For the cleanup code, please use defer and put them in the right place.
There was a problem hiding this comment.
@Letty5411 The volume must be deleted after all containers has been deleted
but the volume name is generated after run container, So if I want to use defer, the logic is:
pull image
defer rm image
run container1
run container2
getVolumeName
defer rm volume
defer rm container1
defer rm container2
I think it's ugly. So I don't use defer
Letty5411
reviewed
Jun 20, 2018
test/cli_run_volume_test.go
Outdated
| @@ -170,6 +172,53 @@ func (suite *PouchRunVolumeSuite) TestRunWithVolumesFromWithDupclicate(c *check. | |||
| c.Assert(volumeFound, check.Equals, true) | |||
| } | |||
|
|
|||
| func (suite *PouchRunVolumeSuite) TestRunWithVolumesFromDifferentSources(c *check.C) { | |||
| imageWithVolume := "registry.hub.docker.com/shaloulcy/busybox:with-volume" | |||
There was a problem hiding this comment.
Please add a todo here, we'd better build image explicitly when build CMD is supported in pouch.
the volumes of container have four different sources(volumes-from, binds, images and Config.Volume). If two volumes have the same destination, only one volume is reserved. The order is volumes-from > binds > images > Config.Volume Signed-off-by: Eric Li <[email protected]>
shaloulcy
force-pushed
the
volume_from_test
branch
from
27f0e6b to
1198581
Compare
|
@Letty5411 I have updated the code, PTAL |
|
LGTM |
pouchrobot
added
the
LGTM
This was referenced Jun 21, 2018
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.
the volumes of container have four different sources(volumes-from,
binds, images and Config.Volume). If two volumes have the same destination,
only one volume is reserved. The order is
volumes-from > binds > images > Config.Volume
Signed-off-by: Eric Li [email protected]
Ⅰ. Describe what this PR did
the volumes of container have four different sources(volumes-from, binds, images and Config.Volume). If two volumes have the same destination, only one volume is reserved. The order is
volumes-from > binds > images > Config.Volume
Ⅱ. Does this pull request fix one issue?
NONE
Ⅲ. Describe how you did it
NONE
Ⅳ. Describe how to verify it
NONE
Ⅴ. Special notes for reviews