Skip to content

Update the test_inspect_network - #888

Merged
shin- merged 1 commit into
docker:masterfrom
wenchma:18626-sync_inspect_network
Jan 5, 2016
Merged

Update the test_inspect_network#888
shin- merged 1 commit into
docker:masterfrom
wenchma:18626-sync_inspect_network

Conversation

@wenchma

Copy link
Copy Markdown

This is depended by moby/moby#18928

Related to moby/moby#18626

Signed-off-by: Wen Cheng Ma wenchma@cn.ibm.com

@wenchma

Copy link
Copy Markdown
Author

This PR and moby/moby#18928 depend on each other, so it will block each other. I workaround it that firstly we remove test_inspect_network temporarily, once moby/moby#18928 is merged, I can revert the remove and update the test. wdyt ? @shin-

@wenchma
wenchmaforce-pushed the 18626-sync_inspect_network branch from 6b39800 to bd192e1CompareDecember 29, 2015 09:09
@wenchmawenchma changed the title Sync docker network inspect testRemove test_inspect_network temporarilyDec 29, 2015
@shin-

Copy link
Copy Markdown
Contributor

Maybe change the test instead so that it tests a few specific values in the result - I would check for the presence (and validity) of Name, Id and Driver in particular. That would prevent the current deadlock as well.

@wenchma
wenchmaforce-pushed the 18626-sync_inspect_network branch from bd192e1 to 59e7242CompareDecember 30, 2015 02:33
@wenchmawenchma changed the title Remove test_inspect_network temporarilyUpdate the test_inspect_network temporarilyDec 30, 2015
@wenchma
wenchmaforce-pushed the 18626-sync_inspect_network branch 2 times, most recently from ae97fab to c424148CompareDecember 30, 2015 02:42
This is based on moby/moby#18928
Related to moby/moby#18626
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
@wenchma

Copy link
Copy Markdown
Author

@shin- good idea, 👍 already updated the PR to cover only a few specific values.

@wenchmawenchma changed the title Update the test_inspect_network temporarilyUpdate the test_inspect_networkDec 30, 2015
@shin-

shin- commented Jan 5, 2016

Copy link
Copy Markdown
Contributor

Thanks - LGTM!

shin- added a commit that referenced this pull request Jan 5, 2016
@shin-
shin- merged commit 140879d into docker:masterJan 5, 2016
@shin-shin- added this to the 1.7.0 milestone Jan 5, 2016
wenchma pushed a commit to wenchma/docker that referenced this pull request Jan 15, 2016
* If user doesn't specify the subnets to create a network, it will pick
subnets from inside preferred pool. This PR aims to inspect these subnets info
* Add integration tests for docker inspect the subnets.
* docker-py project is already synchronized.
* jenkins checks depend on docker/docker-py#888
Fixes issue moby#18626
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
aditirajagopal pushed a commit to aditirajagopal/docker that referenced this pull request Feb 8, 2016
* If user doesn't specify the subnets to create a network, it will pick
subnets from inside preferred pool. This PR aims to inspect these subnets info
* Add integration tests for docker inspect the subnets.
* docker-py project is already synchronized.
* jenkins checks depend on docker/docker-py#888
Fixes issue moby#18626
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
tiborvass pushed a commit to tiborvass/cli that referenced this pull request May 11, 2017
* If user doesn't specify the subnets to create a network, it will pick
subnets from inside preferred pool. This PR aims to inspect these subnets info
* Add integration tests for docker inspect the subnets.
* docker-py project is already synchronized.
* jenkins checks depend on docker/docker-py#888
Fixes issue #18626
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
Sign up for freeto 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

@wenchma@shin-@GordonTheTurtle