Browse code
testutil: update WithExperimental signature to be a daemon.Option
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Sebastiaan van Stijn authored on 2019/09/30 21:23:56Showing 6 changed files
- integration/build/build_squash_test.go
- integration/internal/swarm/service.go
- integration/plugin/authz/main_test.go
- integration/plugin/graphdriver/external_test.go
- integration/service/plugin_test.go
- testutil/daemon/ops.go
| ... | ... |
@@ -26,7 +26,7 @@ func TestBuildSquashParent(t *testing.T) {
|
| 26 | 26 |
if !testEnv.DaemonInfo.ExperimentalBuild {
|
| 27 | 27 |
skip.If(t, testEnv.IsRemoteDaemon, "cannot run daemon when remote daemon") |
| 28 | 28 |
|
| 29 |
- d := daemon.New(t, daemon.WithExperimental) |
|
| 29 |
+ d := daemon.New(t, daemon.WithExperimental()) |
|
| 30 | 30 |
d.StartWithBusybox(t) |
| 31 | 31 |
defer d.Stop(t) |
| 32 | 32 |
client = d.NewClientT(t) |
| ... | ... |
@@ -54,7 +54,7 @@ func NewSwarm(t *testing.T, testEnv *environment.Execution, ops ...daemon.Option |
| 54 | 54 |
skip.If(t, testEnv.IsRemoteDaemon) |
| 55 | 55 |
skip.If(t, testEnv.DaemonInfo.OSType == "windows") |
| 56 | 56 |
if testEnv.DaemonInfo.ExperimentalBuild {
|
| 57 |
- ops = append(ops, daemon.WithExperimental) |
|
| 57 |
+ ops = append(ops, daemon.WithExperimental()) |
|
| 58 | 58 |
} |
| 59 | 59 |
d := daemon.New(t, ops...) |
| 60 | 60 |
d.StartAndSwarmInit(t) |
| ... | ... |
@@ -51,7 +51,7 @@ func setupTest(t *testing.T) func() {
|
| 51 | 51 |
skip.If(t, testEnv.DaemonInfo.OSType == "windows") |
| 52 | 52 |
environment.ProtectAll(t, testEnv) |
| 53 | 53 |
|
| 54 |
- d = daemon.New(t, daemon.WithExperimental) |
|
| 54 |
+ d = daemon.New(t, daemon.WithExperimental()) |
|
| 55 | 55 |
|
| 56 | 56 |
return func() {
|
| 57 | 57 |
if d != nil {
|
| ... | ... |
@@ -54,7 +54,7 @@ func TestExternalGraphDriver(t *testing.T) {
|
| 54 | 54 |
sserver := setupPluginViaSpecFile(t, ec) |
| 55 | 55 |
jserver := setupPluginViaJSONFile(t, ec) |
| 56 | 56 |
// Create daemon |
| 57 |
- d := daemon.New(t, daemon.WithExperimental) |
|
| 57 |
+ d := daemon.New(t, daemon.WithExperimental()) |
|
| 58 | 58 |
c := d.NewClientT(t) |
| 59 | 59 |
|
| 60 | 60 |
for _, tc := range []struct {
|
| ... | ... |
@@ -410,7 +410,7 @@ func TestGraphdriverPluginV2(t *testing.T) {
|
| 410 | 410 |
skip.If(t, os.Getenv("DOCKER_ENGINE_GOARCH") != "amd64")
|
| 411 | 411 |
skip.If(t, !requirement.Overlay2Supported(testEnv.DaemonInfo.KernelVersion)) |
| 412 | 412 |
|
| 413 |
- d := daemon.New(t, daemon.WithExperimental) |
|
| 413 |
+ d := daemon.New(t, daemon.WithExperimental()) |
|
| 414 | 414 |
d.Start(t) |
| 415 | 415 |
defer d.Stop(t) |
| 416 | 416 |
|
| ... | ... |
@@ -56,12 +56,12 @@ func TestServicePlugin(t *testing.T) {
|
| 56 | 56 |
assert.NilError(t, err) |
| 57 | 57 |
d.Stop(t) |
| 58 | 58 |
|
| 59 |
- d1 := swarm.NewSwarm(t, testEnv, daemon.WithExperimental) |
|
| 59 |
+ d1 := swarm.NewSwarm(t, testEnv, daemon.WithExperimental()) |
|
| 60 | 60 |
defer d1.Stop(t) |
| 61 |
- d2 := daemon.New(t, daemon.WithExperimental, daemon.WithSwarmPort(daemon.DefaultSwarmPort+1)) |
|
| 61 |
+ d2 := daemon.New(t, daemon.WithExperimental(), daemon.WithSwarmPort(daemon.DefaultSwarmPort+1)) |
|
| 62 | 62 |
d2.StartAndSwarmJoin(t, d1, true) |
| 63 | 63 |
defer d2.Stop(t) |
| 64 |
- d3 := daemon.New(t, daemon.WithExperimental, daemon.WithSwarmPort(daemon.DefaultSwarmPort+2)) |
|
| 64 |
+ d3 := daemon.New(t, daemon.WithExperimental(), daemon.WithSwarmPort(daemon.DefaultSwarmPort+2)) |
|
| 65 | 65 |
d3.StartAndSwarmJoin(t, d1, false) |
| 66 | 66 |
defer d3.Stop(t) |
| 67 | 67 |
|
| ... | ... |
@@ -24,8 +24,10 @@ func WithTestLogger(t testing.TB) Option {
|
| 24 | 24 |
} |
| 25 | 25 |
|
| 26 | 26 |
// WithExperimental sets the daemon in experimental mode |
| 27 |
-func WithExperimental(d *Daemon) {
|
|
| 28 |
- d.experimental = true |
|
| 27 |
+func WithExperimental() Option {
|
|
| 28 |
+ return func(d *Daemon) {
|
|
| 29 |
+ d.experimental = true |
|
| 30 |
+ } |
|
| 29 | 31 |
} |
| 30 | 32 |
|
| 31 | 33 |
// WithInit sets the daemon init |