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 contrib.docker_runner exit code check #2355 #2356

Merged
merged 1 commit into from
Feb 19, 2018
Merged

Conversation

yonromai
Copy link
Contributor

@yonromai yonromai commented Feb 19, 2018

Prior to 3.0.0, docker-py used to return the status code as an int - it now returns a dict (cf. 2.7.0 Container.wait doc vs 3.0.1 Container.wait doc)

The fix is to check if the return type is a dict, to attempt to maintain backward compatibility.

@yonromai yonromai force-pushed the romain/fix-build branch 3 times, most recently from feb1dcc to 67a91e6 Compare February 19, 2018 17:53
@yonromai yonromai changed the title disable broken test contrib.docker_runner.test_local_file_mount - cf.… fix contrib.docker_runner exit code check #2355 Feb 19, 2018
Copy link
Collaborator

@dlstadther dlstadther left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Plus, tests pass now. Merge away!

@ravwojdyla
Copy link

+1

@yonromai yonromai merged commit aa783fd into master Feb 19, 2018
@yonromai yonromai deleted the romain/fix-build branch February 19, 2018 18:47
@yonromai yonromai mentioned this pull request Feb 20, 2018
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