Remove unused ExperimentalDaemon, NotS390X, NotPausable requirement checks
Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 362f737e1ccf9a1c3ac9599f48b10a33fd9b0e08) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: 008cc8ee495d5f13d44764e906d92a8999f4c473 Component: engine
This commit is contained in:
@@ -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
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user