Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix test failures on docker 1.1.2 #460

Merged
merged 2 commits into from
Oct 1, 2014

Conversation

dnephin
Copy link

@dnephin dnephin commented Aug 31, 2014

Some background in #328, but I've seen the integration test suite failing on two tests (test_project_up_recreates_containers, test_recreate_containers) for a while now, ever since I upgraded to docker 1.1.x.

Changing the path from /var/db/ to /etc/ fixes this, which I think is an improvement for now (so that the tests are still useful for catching other issues).

The second part of this change is to add a container.get(). This uses dotted notation and performs an inspect_if_not_inspected() on each call, removing the need to call it everywhere, and providing a nicer interface for fetching other container data if there isn't an existing property for it.

@dnephin dnephin force-pushed the fix_tests_for_docker_1.1 branch 2 times, most recently from f9ce9d4 to 306ff8b Compare August 31, 2014 17:29
@dnephin
Copy link
Author

dnephin commented Aug 31, 2014

Earlier diffs had some bugs in human_readable_port. These errors would have been caught by the tests added in #402, so I'd rather not duplicate the tests here. Maybe that branch can be merged first.

@bfirsh
Copy link

bfirsh commented Sep 8, 2014

Looks good, but needs a rebase!

…t() in every property, and provides a nicer interface for querying container data.

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
…e_container() explaining what it does.

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
@dnephin dnephin force-pushed the fix_tests_for_docker_1.1 branch from 306ff8b to 71e7103 Compare September 10, 2014 01:44
@dnephin
Copy link
Author

dnephin commented Sep 10, 2014

Rebased

@bfirsh
Copy link

bfirsh commented Sep 10, 2014

LGTM

@bfirsh bfirsh added this to the 1.0.0 milestone Sep 30, 2014
aanand added a commit that referenced this pull request Oct 1, 2014
@aanand aanand merged commit ec5c864 into docker:master Oct 1, 2014
@dnephin dnephin deleted the fix_tests_for_docker_1.1 branch October 1, 2014 01:09
yuval-k pushed a commit to yuval-k/compose that referenced this pull request Apr 10, 2015
Fix test failures on docker 1.1.2
Signed-off-by: Yuval Kohavi <yuval.kohavi@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants