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

Add docker-py integration tests aginst the docker daemon #9741

Merged
merged 2 commits into from
Dec 19, 2014

Conversation

tianon
Copy link
Member

@tianon tianon commented Dec 19, 2014

Closes #9676

Changes from @crosbymichael's code:

  • move docker/docker-py clone to the Dockerfile
  • put "integration test daemon startup" code in a separate file for both scripts to source
  • add new test-docker-py Makefile target
  • include "python-websocket" package in Dockerfile for running the tests
$ make test-docker-py
docker build -t "docker:add-docker-py-tests" .
Sending build context to Docker daemon 43.49 MB
Sending build context to Docker daemon 
Step 0 : FROM ubuntu:14.04
...
Successfully built c04cdc4c528a
docker run --rm -it --privileged -e BUILDFLAGS -e DOCKER_CLIENTONLY -e DOCKER_EXECDRIVER -e DOCKER_GRAPHDRIVER -e TESTDIRS -e TESTFLAGS -e TIMEOUT -v "/home/tianon/docker/docker/bundles:/go/src/github.com/docker/docker/bundles" "docker:test-docker-py" hack/make.sh binary test-docker-py

bundles/1.4.1-dev already exists. Removing.

---> Making bundle: binary (in bundles/1.4.1-dev/binary)
Created binary: /go/src/github.com/docker/docker/bundles/1.4.1-dev/binary/docker-1.4.1-dev

---> Making bundle: test-docker-py (in bundles/1.4.1-dev/test-docker-py)
+++ exec docker --daemon --debug --storage-driver vfs --exec-driver native --pidfile /go/src/github.com/docker/docker/bundles/1.4.1-dev/test-docker-py/docker.pid
...................................................
----------------------------------------------------------------------
Ran 51 tests in 77.919s

OK
++++ cat /go/src/github.com/docker/docker/bundles/1.4.1-dev/test-docker-py/docker.pid
+++ kill 685

This clones and run the integration tests for docker-py master as part
of the integration tests created on master.  docker-py hits the api
directly and should be a good way to identify regressions in the api.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
@tianon
Copy link
Member Author

tianon commented Dec 19, 2014

See, another case where having Drone run make.sh with no arguments would be doing extra cool stuff automatically (ie, testing this PR properly for us). 👍

@tianon
Copy link
Member Author

tianon commented Dec 19, 2014

I also propose we wait to really consider this until tomorrow when 0.7.0 is expected to drop so we can switch over to using that tag instead of this temporary 0.6.0-integration branch that @shin- is nice enough to have up for us with some fixes that've happened to that test since 0.6.0 was tagged. 👍

- move docker/docker-py clone to the Dockerfile
- put "integration test daemon startup" code in a separate file for both scripts to source
- add new test-docker-py Makefile target
- include "python-websocket" package in Dockerfile for running the tests

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
@tianon
Copy link
Member Author

tianon commented Dec 19, 2014

Updated with 0.7.0! 👍

@jessfraz
Copy link
Contributor

wooohoooo

@LK4D4
Copy link
Contributor

LK4D4 commented Dec 19, 2014

Haha, panic on drone!

@shin-
Copy link
Contributor

shin- commented Dec 19, 2014

👍

@crosbymichael
Copy link
Contributor

LGTM

@crosbymichael
Copy link
Contributor

I create the new drone images as soon as this is merged

@LK4D4
Copy link
Contributor

LK4D4 commented Dec 19, 2014

LGTM

LK4D4 added a commit that referenced this pull request Dec 19, 2014
Add docker-py integration tests aginst the docker daemon
@LK4D4 LK4D4 merged commit 0874f9a into moby:master Dec 19, 2014
@tianon tianon deleted the test-docker-py branch December 19, 2014 20:01
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.

None yet

5 participants