docker
/
docker-py
mirror of https://github.com/docker/docker-py.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ensure Makefile still run tests properly / tests are run in container as expected

This commit is contained in:
Joffrey F 2015-08-25 16:58:01 -07:00
parent f9a540aa77
commit b5f1e64e8f
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.dockerignore
View File

@ -10,6 +10,7 @@ dist
.tox .tox
.coverage .coverage
html/* html/*
tests/__pycache__
# Compiled Documentation # Compiled Documentation
site/ site/

8
Makefile
View File

@ -13,13 +13,13 @@ build-py3:
test: unit-test integration-test unit-test-py3 integration-test-py3 test: unit-test integration-test unit-test-py3 integration-test-py3
unit-test: build unit-test: build
docker run docker-py py.test tests/test.py docker run docker-py py.test tests/test.py tests/utils_test.py
unit-test-py3: build-py3 unit-test-py3: build-py3
docker run docker-py3 py.test tests/test.py docker run docker-py3 py.test tests/test.py tests/utils_test.py
integration-test: build integration-test: build
docker run -e NOT_ON_HOST=true -v `$(HOST_TMPDIR)`:/tmp -v /var/run/docker.sock:/var/run/docker.sock docker-py python tests/integration_test.py docker run -e NOT_ON_HOST=true -v `$(HOST_TMPDIR)`:/tmp -v /var/run/docker.sock:/var/run/docker.sock docker-py py.test tests/integration_test.py
integration-test-py3: build-py3 integration-test-py3: build-py3
docker run -e NOT_ON_HOST=true -v `$(HOST_TMPDIR)`:/tmp -v /var/run/docker.sock:/var/run/docker.sock docker-py3 python tests/integration_test.py docker run -e NOT_ON_HOST=true -v `$(HOST_TMPDIR)`:/tmp -v /var/run/docker.sock:/var/run/docker.sock docker-py3 py.test tests/integration_test.py

2
tests/integration_test.py
View File

@ -33,7 +33,7 @@ import six
from six.moves import BaseHTTPServer from six.moves import BaseHTTPServer
from six.moves import socketserver from six.moves import socketserver
from test import Cleanup from .test import Cleanup
# FIXME: missing tests for # FIXME: missing tests for
# export; history; insert; port; push; tag; get; load; stats # export; history; insert; port; push; tag; get; load; stats