Fix integration tests by adding DOCKER_TMPDIR env in the test init function

Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: 872db07119e702424dc27cd6e3396b3f2109c468
Component: engine
This commit is contained in:
Tibor Vass
2014-08-06 15:55:50 -04:00
parent ddc4e78a18
commit db456f6481

View File

@ -31,6 +31,7 @@ const (
unitTestImageIDShort = "83599e29c455"
unitTestNetworkBridge = "testdockbr0"
unitTestStoreBase = "/var/lib/docker/unit-tests"
unitTestDockerTmpdir = "/var/lib/docker/tmp"
testDaemonAddr = "127.0.0.1:4270"
testDaemonProto = "tcp"
testDaemonHttpsProto = "tcp"
@ -90,6 +91,7 @@ func init() {
// To test other drivers, we need a dedicated driver validation suite.
os.Setenv("DOCKER_DRIVER", "vfs")
os.Setenv("TEST", "1")
os.Setenv("DOCKER_TMPDIR", unitTestDockerTmpdir)
// Hack to run sys init during unit testing
if selfPath := utils.SelfPath(); strings.Contains(selfPath, ".dockerinit") {