Now that the gocheck framework is no longer used, we don't
have to define these interfaces.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
| ... | ... |
@@ -32,14 +32,8 @@ type testingT interface {
|
| 32 | 32 |
assert.TestingT |
| 33 | 33 |
logT |
| 34 | 34 |
Fatalf(string, ...interface{})
|
| 35 |
-} |
|
| 36 |
- |
|
| 37 |
-type namer interface {
|
|
| 38 | 35 |
Name() string |
| 39 | 36 |
} |
| 40 |
-type testNamer interface {
|
|
| 41 |
- TestName() string |
|
| 42 |
-} |
|
| 43 | 37 |
|
| 44 | 38 |
type logT interface {
|
| 45 | 39 |
Logf(string, ...interface{})
|
| ... | ... |
@@ -157,13 +151,8 @@ func New(t testingT, ops ...Option) *Daemon {
|
| 157 | 157 |
if dest == "" {
|
| 158 | 158 |
dest = os.Getenv("DEST")
|
| 159 | 159 |
} |
| 160 |
+ dest = filepath.Join(dest, t.Name()) |
|
| 160 | 161 |
|
| 161 |
- switch v := t.(type) {
|
|
| 162 |
- case namer: |
|
| 163 |
- dest = filepath.Join(dest, v.Name()) |
|
| 164 |
- case testNamer: |
|
| 165 |
- dest = filepath.Join(dest, v.TestName()) |
|
| 166 |
- } |
|
| 167 | 162 |
assert.Check(t, dest != "", "Please set the DOCKER_INTEGRATION_DAEMON_DEST or the DEST environment variable") |
| 168 | 163 |
|
| 169 | 164 |
t.Logf("Creating a new daemon at: %q", dest)
|