mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Export the LogT type and use it in the options
Signed-off-by: Sam Whited <sam@samwhited.com>
This commit is contained in:
parent
f5bb374a0c
commit
95ea6e7069
2 changed files with 5 additions and 6 deletions
|
@ -28,11 +28,12 @@ import (
|
|||
"gotest.tools/assert"
|
||||
)
|
||||
|
||||
type logT interface {
|
||||
// LogT is the subset of the testing.TB interface used by the daemon.
|
||||
type LogT interface {
|
||||
Logf(string, ...interface{})
|
||||
}
|
||||
|
||||
// nopLog is a no-op implementation of logT that is used in daemons created by
|
||||
// nopLog is a no-op implementation of LogT that is used in daemons created by
|
||||
// NewDaemon (where no testing.TB is available).
|
||||
type nopLog struct{}
|
||||
|
||||
|
@ -71,7 +72,7 @@ type Daemon struct {
|
|||
experimental bool
|
||||
init bool
|
||||
dockerdBinary string
|
||||
log logT
|
||||
log LogT
|
||||
pidFile string
|
||||
args []string
|
||||
|
||||
|
|
|
@ -1,8 +1,6 @@
|
|||
package daemon
|
||||
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"github.com/docker/docker/testutil/environment"
|
||||
)
|
||||
|
||||
|
@ -17,7 +15,7 @@ func WithDefaultCgroupNamespaceMode(mode string) Option {
|
|||
}
|
||||
|
||||
// WithTestLogger causes the daemon to log certain actions to the provided test.
|
||||
func WithTestLogger(t testing.TB) Option {
|
||||
func WithTestLogger(t LogT) Option {
|
||||
return func(d *Daemon) {
|
||||
d.log = t
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue