Skip to content

Fixes for "make integration-test" #587

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
May 7, 2015
Merged

Fixes for "make integration-test" #587

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
070cbec
Fixes for #586
shin- May 7, 2015
2fdc433
dev version
shin- May 7, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
.PHONY: all build test integration-test unit-test

HOST_TMPDIR=test -n "$(TMPDIR)" && echo $(TMPDIR) || echo /tmp

all: test

build:
Expand All @@ -11,5 +13,4 @@ unit-test: build
docker run docker-py python tests/test.py

integration-test: build
docker run -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 python tests/integration_test.py
2 changes: 1 addition & 1 deletion docker/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
version = "1.2.2"
version = "1.2.3-dev"
version_info = tuple([int(d) for d in version.replace("-dev", "").split(".")])
2 changes: 2 additions & 0 deletions tests/integration_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
# export; history; insert; port; push; tag; get; load; stats
DEFAULT_BASE_URL = os.environ.get('DOCKER_HOST')
EXEC_DRIVER_IS_NATIVE = True
NOT_ON_HOST = os.environ.get('NOT_ON_HOST', False)

warnings.simplefilter('error')
create_host_config = docker.utils.create_host_config
Expand Down Expand Up @@ -1435,6 +1436,7 @@ def runTest(self):
self.tmp_imgs.append(img_id)


@unittest.skipIf(NOT_ON_HOST, 'Tests running inside a container')
class TestImportFromURL(ImportTestCase):
'''Tests downloading an image over HTTP.'''

Expand Down