1. docker
  2. Commit da8032d7d351a2073f54ec0121a796800b6b1a46
Browse code

Remove deprecated environment.ExperimentalDaemon()

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Sebastiaan van Stijn authored on 2018/01/15 23:30:05
Showing 8 changed files
integration-cli/check_test.go
History View file @ da8032d
... ... 
@@ -129,7 +129,7 @@ func (s *DockerRegistrySuite) SetUpTest(c *check.C) {
129 129 
 	testRequires(c, DaemonIsLinux, registry.Hosting, SameHostDaemon)
130 130 
 	s.reg = setupRegistry(c, false, "", "")
131 131 
 	s.d = daemon.New(c, dockerBinary, dockerdBinary, daemon.Config{
132 
-		Experimental: testEnv.ExperimentalDaemon(),
132 
+		Experimental: testEnv.DaemonInfo.ExperimentalBuild,
133 133 
 	})
134 134 
 }
135 135
... ... 
@@ -163,7 +163,7 @@ func (s *DockerSchema1RegistrySuite) SetUpTest(c *check.C) {
163 163 
 	testRequires(c, DaemonIsLinux, registry.Hosting, NotArm64, SameHostDaemon)
164 164 
 	s.reg = setupRegistry(c, true, "", "")
165 165 
 	s.d = daemon.New(c, dockerBinary, dockerdBinary, daemon.Config{
166 
-		Experimental: testEnv.ExperimentalDaemon(),
166 
+		Experimental: testEnv.DaemonInfo.ExperimentalBuild,
167 167 
 	})
168 168 
 }
169 169
... ... 
@@ -197,7 +197,7 @@ func (s *DockerRegistryAuthHtpasswdSuite) SetUpTest(c *check.C) {
197 197 
 	testRequires(c, DaemonIsLinux, registry.Hosting, SameHostDaemon)
198 198 
 	s.reg = setupRegistry(c, false, "htpasswd", "")
199 199 
 	s.d = daemon.New(c, dockerBinary, dockerdBinary, daemon.Config{
200 
-		Experimental: testEnv.ExperimentalDaemon(),
200 
+		Experimental: testEnv.DaemonInfo.ExperimentalBuild,
201 201 
 	})
202 202 
 }
203 203
... ... 
@@ -232,7 +232,7 @@ func (s *DockerRegistryAuthTokenSuite) OnTimeout(c *check.C) {
232 232 
 func (s *DockerRegistryAuthTokenSuite) SetUpTest(c *check.C) {
233 233 
 	testRequires(c, DaemonIsLinux, registry.Hosting, SameHostDaemon)
234 234 
 	s.d = daemon.New(c, dockerBinary, dockerdBinary, daemon.Config{
235 
-		Experimental: testEnv.ExperimentalDaemon(),
235 
+		Experimental: testEnv.DaemonInfo.ExperimentalBuild,
236 236 
 	})
237 237 
 }
238 238
... ... 
@@ -273,7 +273,7 @@ func (s *DockerDaemonSuite) OnTimeout(c *check.C) {
273 273 
 func (s *DockerDaemonSuite) SetUpTest(c *check.C) {
274 274 
 	testRequires(c, DaemonIsLinux, SameHostDaemon)
275 275 
 	s.d = daemon.New(c, dockerBinary, dockerdBinary, daemon.Config{
276 
-		Experimental: testEnv.ExperimentalDaemon(),
276 
+		Experimental: testEnv.DaemonInfo.ExperimentalBuild,
277 277 
 	})
278 278 
 }
279 279
... ... 
@@ -331,7 +331,7 @@ func (s *DockerSwarmSuite) SetUpTest(c *check.C) {
331 331 
 func (s *DockerSwarmSuite) AddDaemon(c *check.C, joinSwarm, manager bool) *daemon.Swarm {
332 332 
 	d := &daemon.Swarm{
333 333 
 		Daemon: daemon.New(c, dockerBinary, dockerdBinary, daemon.Config{
334 
-			Experimental: testEnv.ExperimentalDaemon(),
334 
+			Experimental: testEnv.DaemonInfo.ExperimentalBuild,
335 335 
 		}),
336 336 
 		Port: defaultSwarmPort + s.portIndex,
337 337 
 	}
integration-cli/docker_cli_daemon_test.go
History View file @ da8032d
... ... 
@@ -1434,7 +1434,7 @@ func (s *DockerDaemonSuite) TestDaemonRestartWithSocketAsVolume(c *check.C) {
1434 1434 
 // A subsequent daemon restart should clean up said mounts.
1435 1435 
 func (s *DockerDaemonSuite) TestCleanupMountsAfterDaemonAndContainerKill(c *check.C) {
1436 1436 
 	d := daemon.New(c, dockerBinary, dockerdBinary, daemon.Config{
1437 
-		Experimental: testEnv.ExperimentalDaemon(),
1437 
+		Experimental: testEnv.DaemonInfo.ExperimentalBuild,
1438 1438 
 	})
1439 1439 
 	d.StartWithBusybox(c)
1440 1440
... ... 
@@ -1474,7 +1474,7 @@ func (s *DockerDaemonSuite) TestCleanupMountsAfterDaemonAndContainerKill(c *chec
1474 1474 
 // os.Interrupt should perform a graceful daemon shutdown and hence cleanup mounts.
1475 1475 
 func (s *DockerDaemonSuite) TestCleanupMountsAfterGracefulShutdown(c *check.C) {
1476 1476 
 	d := daemon.New(c, dockerBinary, dockerdBinary, daemon.Config{
1477 
-		Experimental: testEnv.ExperimentalDaemon(),
1477 
+		Experimental: testEnv.DaemonInfo.ExperimentalBuild,
1478 1478 
 	})
1479 1479 
 	d.StartWithBusybox(c)
1480 1480
... ... 
@@ -1695,7 +1695,7 @@ func (s *DockerDaemonSuite) TestDaemonRestartLocalVolumes(c *check.C) {
1695 1695 
 // FIXME(vdemeester) should be a unit test
1696 1696 
 func (s *DockerDaemonSuite) TestDaemonCorruptedLogDriverAddress(c *check.C) {
1697 1697 
 	d := daemon.New(c, dockerBinary, dockerdBinary, daemon.Config{
1698 
-		Experimental: testEnv.ExperimentalDaemon(),
1698 
+		Experimental: testEnv.DaemonInfo.ExperimentalBuild,
1699 1699 
 	})
1700 1700 
 	c.Assert(d.StartWithError("--log-driver=syslog", "--log-opt", "syslog-address=corrupted:42"), check.NotNil)
1701 1701 
 	expected := "Failed to set log opts: syslog-address should be in form proto://address"
... ... 
@@ -1705,7 +1705,7 @@ func (s *DockerDaemonSuite) TestDaemonCorruptedLogDriverAddress(c *check.C) {
1705 1705 
 // FIXME(vdemeester) should be a unit test
1706 1706 
 func (s *DockerDaemonSuite) TestDaemonCorruptedFluentdAddress(c *check.C) {
1707 1707 
 	d := daemon.New(c, dockerBinary, dockerdBinary, daemon.Config{
1708 
-		Experimental: testEnv.ExperimentalDaemon(),
1708 
+		Experimental: testEnv.DaemonInfo.ExperimentalBuild,
1709 1709 
 	})
1710 1710 
 	c.Assert(d.StartWithError("--log-driver=fluentd", "--log-opt", "fluentd-address=corrupted:c"), check.NotNil)
1711 1711 
 	expected := "Failed to set log opts: invalid fluentd-address corrupted:c: "
... ... 
@@ -3082,7 +3082,7 @@ func (s *DockerDaemonSuite) TestDaemonIpcModeShareableFromConfig(c *check.C) {
3082 3082
3083 3083 
 func testDaemonStartIpcMode(c *check.C, from, mode string, valid bool) {
3084 3084 
 	d := daemon.New(c, dockerBinary, dockerdBinary, daemon.Config{
3085 
-		Experimental: testEnv.ExperimentalDaemon(),
3085 
+		Experimental: testEnv.DaemonInfo.ExperimentalBuild,
3086 3086 
 	})
3087 3087 
 	c.Logf("Checking IpcMode %s set from %s\n", mode, from)
3088 3088 
 	var serr error
integration-cli/docker_cli_external_graphdriver_unix_test.go
History View file @ da8032d
... ... 
@@ -53,7 +53,7 @@ type graphEventsCounter struct {
53 53
54 54 
 func (s *DockerExternalGraphdriverSuite) SetUpTest(c *check.C) {
55 55 
 	s.d = daemon.New(c, dockerBinary, dockerdBinary, daemon.Config{
56 
-		Experimental: testEnv.ExperimentalDaemon(),
56 
+		Experimental: testEnv.DaemonInfo.ExperimentalBuild,
57 57 
 	})
58 58 
 }
59 59
integration-cli/docker_cli_external_volume_driver_unix_test.go
History View file @ da8032d
... ... 
@@ -52,7 +52,7 @@ type DockerExternalVolumeSuite struct {
52 52 
 func (s *DockerExternalVolumeSuite) SetUpTest(c *check.C) {
53 53 
 	testRequires(c, SameHostDaemon)
54 54 
 	s.d = daemon.New(c, dockerBinary, dockerdBinary, daemon.Config{
55 
-		Experimental: testEnv.ExperimentalDaemon(),
55 
+		Experimental: testEnv.DaemonInfo.ExperimentalBuild,
56 56 
 	})
57 57 
 	s.ec = &eventCounter{}
58 58 
 }
integration-cli/docker_cli_info_test.go
History View file @ da8032d
... ... 
@@ -44,7 +44,7 @@ func (s *DockerSuite) TestInfoEnsureSucceeds(c *check.C) {
44 44 
 		stringsToCheck = append(stringsToCheck, "Runtimes:", "Default Runtime: runc")
45 45 
 	}
46 46
47 
-	if testEnv.ExperimentalDaemon() {
47 
+	if testEnv.DaemonInfo.ExperimentalBuild {
48 48 
 		stringsToCheck = append(stringsToCheck, "Experimental: true")
49 49 
 	} else {
50 50 
 		stringsToCheck = append(stringsToCheck, "Experimental: false")
... ... 
@@ -72,7 +72,7 @@ func (s *DockerSuite) TestInfoDiscoveryBackend(c *check.C) {
72 72 
 	testRequires(c, SameHostDaemon, DaemonIsLinux)
73 73
74 74 
 	d := daemon.New(c, dockerBinary, dockerdBinary, daemon.Config{
75 
-		Experimental: testEnv.ExperimentalDaemon(),
75 
+		Experimental: testEnv.DaemonInfo.ExperimentalBuild,
76 76 
 	})
77 77 
 	discoveryBackend := "consul://consuladdr:consulport/some/path"
78 78 
 	discoveryAdvertise := "1.1.1.1:2375"
... ... 
@@ -91,7 +91,7 @@ func (s *DockerSuite) TestInfoDiscoveryInvalidAdvertise(c *check.C) {
91 91 
 	testRequires(c, SameHostDaemon, DaemonIsLinux)
92 92
93 93 
 	d := daemon.New(c, dockerBinary, dockerdBinary, daemon.Config{
94 
-		Experimental: testEnv.ExperimentalDaemon(),
94 
+		Experimental: testEnv.DaemonInfo.ExperimentalBuild,
95 95 
 	})
96 96 
 	discoveryBackend := "consul://consuladdr:consulport/some/path"
97 97
... ... 
@@ -110,7 +110,7 @@ func (s *DockerSuite) TestInfoDiscoveryAdvertiseInterfaceName(c *check.C) {
110 110 
 	testRequires(c, SameHostDaemon, Network, DaemonIsLinux)
111 111
112 112 
 	d := daemon.New(c, dockerBinary, dockerdBinary, daemon.Config{
113 
-		Experimental: testEnv.ExperimentalDaemon(),
113 
+		Experimental: testEnv.DaemonInfo.ExperimentalBuild,
114 114 
 	})
115 115 
 	discoveryBackend := "consul://consuladdr:consulport/some/path"
116 116 
 	discoveryAdvertise := "eth0"
... ... 
@@ -183,7 +183,7 @@ func (s *DockerSuite) TestInfoDebug(c *check.C) {
183 183 
 	testRequires(c, SameHostDaemon, DaemonIsLinux)
184 184
185 185 
 	d := daemon.New(c, dockerBinary, dockerdBinary, daemon.Config{
186 
-		Experimental: testEnv.ExperimentalDaemon(),
186 
+		Experimental: testEnv.DaemonInfo.ExperimentalBuild,
187 187 
 	})
188 188 
 	d.Start(c, "--debug")
189 189 
 	defer d.Stop(c)
... ... 
@@ -206,7 +206,7 @@ func (s *DockerSuite) TestInsecureRegistries(c *check.C) {
206 206 
 	registryHost := "insecurehost.com:5000"
207 207
208 208 
 	d := daemon.New(c, dockerBinary, dockerdBinary, daemon.Config{
209 
-		Experimental: testEnv.ExperimentalDaemon(),
209 
+		Experimental: testEnv.DaemonInfo.ExperimentalBuild,
210 210 
 	})
211 211 
 	d.Start(c, "--insecure-registry="+registryCIDR, "--insecure-registry="+registryHost)
212 212 
 	defer d.Stop(c)
integration-cli/docker_cli_network_unix_test.go
History View file @ da8032d
... ... 
@@ -50,7 +50,7 @@ type DockerNetworkSuite struct {
50 50
51 51 
 func (s *DockerNetworkSuite) SetUpTest(c *check.C) {
52 52 
 	s.d = daemon.New(c, dockerBinary, dockerdBinary, daemon.Config{
53 
-		Experimental: testEnv.ExperimentalDaemon(),
53 
+		Experimental: testEnv.DaemonInfo.ExperimentalBuild,
54 54 
 	})
55 55 
 }
56 56
integration-cli/docker_hub_pull_suite_test.go
History View file @ da8032d
... ... 
@@ -41,7 +41,7 @@ func newDockerHubPullSuite() *DockerHubPullSuite {
41 41 
 func (s *DockerHubPullSuite) SetUpSuite(c *check.C) {
42 42 
 	testRequires(c, DaemonIsLinux, SameHostDaemon)
43 43 
 	s.d = daemon.New(c, dockerBinary, dockerdBinary, daemon.Config{
44 
-		Experimental: testEnv.ExperimentalDaemon(),
44 
+		Experimental: testEnv.DaemonInfo.ExperimentalBuild,
45 45 
 	})
46 46 
 	s.d.Start(c)
47 47 
 }
integration-cli/environment/environment.go
History View file @ da8032d
... ... 
@@ -49,13 +49,6 @@ func New() (*Execution, error) {
49 49 
 	}, nil
50 50 
 }
51 51
52 
-// ExperimentalDaemon tell whether the main daemon has
53 
-// experimental features enabled or not
54 
-// Deprecated: use DaemonInfo.ExperimentalBuild
55 
-func (e *Execution) ExperimentalDaemon() bool {
56 
-	return e.DaemonInfo.ExperimentalBuild
57 
-}
58 
-
59 52 
 // DaemonPlatform is held globally so that tests can make intelligent
60 53 
 // decisions on how to configure themselves according to the platform
61 54 
 // of the daemon. This is initialized in docker_utils by sending