kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #24300 from coolljt0725/arm64_test

Browse source 
Add NoArm64 testRequires and skip Schema1RegistrySuite on arm64
This commit is contained in:
Antonio Murdaca 2016-07-05 12:13:30 +02:00 • committed by GitHub
commit 98fa9ef7d3
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
integration-cli/check_test.go
View file

@ -80,7 +80,7 @@ type DockerSchema1RegistrySuite struct {
} }
func (s *DockerSchema1RegistrySuite) SetUpTest(c *check.C) { func (s *DockerSchema1RegistrySuite) SetUpTest(c *check.C) {
testRequires(c, DaemonIsLinux, RegistryHosting) testRequires(c, DaemonIsLinux, RegistryHosting, NotArm64)
s.reg = setupRegistry(c, true, "", "") s.reg = setupRegistry(c, true, "", "")
s.d = NewDaemon(c) s.d = NewDaemon(c)
} }

4
integration-cli/requirements.go
View file

@ -42,6 +42,10 @@ var (
func() bool { return os.Getenv("DOCKER_ENGINE_GOARCH") != "arm" }, func() bool { return os.Getenv("DOCKER_ENGINE_GOARCH") != "arm" },
"Test requires a daemon not running on ARM", "Test requires a daemon not running on ARM",
} }
NotArm64 = testRequirement{
func() bool { return os.Getenv("DOCKER_ENGINE_GOARCH") != "arm64" },
"Test requires a daemon not running on arm64",
}
NotPpc64le = testRequirement{ NotPpc64le = testRequirement{
func() bool { return os.Getenv("DOCKER_ENGINE_GOARCH") != "ppc64le" }, func() bool { return os.Getenv("DOCKER_ENGINE_GOARCH") != "ppc64le" },
"Test requires a daemon not running on ppc64le", "Test requires a daemon not running on ppc64le",