From e887118a6e675a199c981d70bcc4e151e0444d5e Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Mon, 24 Dec 2018 13:16:05 +0100 Subject: [PATCH] Remove unused ExperimentalDaemon, NotS390X, NotPausable requirement checks Signed-off-by: Sebastiaan van Stijn (cherry picked from commit 362f737e1ccf9a1c3ac9599f48b10a33fd9b0e08) Signed-off-by: Sebastiaan van Stijn Upstream-commit: 008cc8ee495d5f13d44764e906d92a8999f4c473 Component: engine --- .../engine/integration-cli/requirements_test.go | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/components/engine/integration-cli/requirements_test.go b/components/engine/integration-cli/requirements_test.go index a087d66603..ddb1b4299e 100644 --- a/components/engine/integration-cli/requirements_test.go +++ b/components/engine/integration-cli/requirements_test.go @@ -60,11 +60,6 @@ func OnlyDefaultNetworks() bool { return true } -// Deprecated: use skip.If(t, !testEnv.DaemonInfo.ExperimentalBuild) -func ExperimentalDaemon() bool { - return testEnv.DaemonInfo.ExperimentalBuild -} - func IsAmd64() bool { return os.Getenv("DOCKER_ENGINE_GOARCH") == "amd64" } @@ -81,10 +76,6 @@ func NotPpc64le() bool { return ArchitectureIsNot("ppc64le") } -func NotS390X() bool { - return ArchitectureIsNot("s390x") -} - func SameHostDaemon() bool { return testEnv.IsLocalDaemon() } @@ -176,13 +167,6 @@ func IsPausable() bool { return true } -func NotPausable() bool { - if testEnv.OSType == "windows" { - return testEnv.DaemonInfo.Isolation == "process" - } - return false -} - func IsolationIs(expectedIsolation string) bool { return testEnv.OSType == "windows" && string(testEnv.DaemonInfo.Isolation) == expectedIsolation }