From 070cbece0aeb3380b4bbd67c1a0ab6444df0340c Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Wed, 6 May 2015 17:53:53 -0700
Subject: [PATCH] Fixes for #586

---
 Makefile                  | 5 +++--
 tests/integration_test.py | 2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 4cb0ffda..cf291ea9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,7 @@
 .PHONY: all build test integration-test unit-test
 
+HOST_TMPDIR=test -n "$(TMPDIR)" && echo $(TMPDIR) || echo /tmp
+
 all: test
 
 build:
@@ -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
diff --git a/tests/integration_test.py b/tests/integration_test.py
index 0db30527..0a569128 100644
--- a/tests/integration_test.py
+++ b/tests/integration_test.py
@@ -39,6 +39,7 @@ from test import Cleanup
 # 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
@@ -1435,6 +1436,7 @@ class TestImportFromStream(ImportTestCase):
         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.'''