Merge pull request #39506 from thaJeztah/group_test_subdirs

integration: organize bundle directory per test
This commit is contained in:
Sebastiaan van Stijn 2019-07-12 21:50:15 +02:00 committed by GitHub
commit 0e041d68d8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -34,6 +34,13 @@ type testingT interface {
Fatalf(string, ...interface{})
}
type namer interface {
Name() string
}
type testNamer interface {
TestName() string
}
type logT interface {
Logf(string, ...interface{})
}
@ -96,6 +103,12 @@ func New(t testingT, ops ...func(*Daemon)) *Daemon {
if dest == "" {
dest = os.Getenv("DEST")
}
switch v := t.(type) {
case namer:
dest = filepath.Join(dest, v.Name())
case testNamer:
dest = filepath.Join(dest, v.TestName())
}
assert.Check(t, dest != "", "Please set the DOCKER_INTEGRATION_DAEMON_DEST or the DEST environment variable")
storageDriver := os.Getenv("DOCKER_GRAPHDRIVER")