Browse code
Remove testing logrus output from ppc64le
This removes two tests on ppc64le.
There is an old bug with a syscall on power #8653, that causes
logrus to default to using logfmt. These two tests look for
logrus format specific strings, and fail if they don't see it.
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
Christopher Jones authored on 2016/02/10 08:02:18Showing 2 changed files
| ... | ... |
@@ -2068,7 +2068,7 @@ func (s *DockerDaemonSuite) TestRunLinksChanged(c *check.C) {
|
| 2068 | 2068 |
} |
| 2069 | 2069 |
|
| 2070 | 2070 |
func (s *DockerDaemonSuite) TestDaemonStartWithoutColors(c *check.C) {
|
| 2071 |
- testRequires(c, DaemonIsLinux) |
|
| 2071 |
+ testRequires(c, DaemonIsLinux, NotPpc64le) |
|
| 2072 | 2072 |
newD := NewDaemon(c) |
| 2073 | 2073 |
|
| 2074 | 2074 |
infoLog := "\x1b[34mINFO\x1b" |
| ... | ... |
@@ -2097,7 +2097,7 @@ func (s *DockerDaemonSuite) TestDaemonStartWithoutColors(c *check.C) {
|
| 2097 | 2097 |
} |
| 2098 | 2098 |
|
| 2099 | 2099 |
func (s *DockerDaemonSuite) TestDaemonDebugLog(c *check.C) {
|
| 2100 |
- testRequires(c, DaemonIsLinux) |
|
| 2100 |
+ testRequires(c, DaemonIsLinux, NotPpc64le) |
|
| 2101 | 2101 |
newD := NewDaemon(c) |
| 2102 | 2102 |
|
| 2103 | 2103 |
debugLog := "\x1b[37mDEBU\x1b" |
| ... | ... |
@@ -33,6 +33,10 @@ var ( |
| 33 | 33 |
func() bool { return os.Getenv("DOCKER_ENGINE_GOARCH") != "arm" },
|
| 34 | 34 |
"Test requires a daemon not running on ARM", |
| 35 | 35 |
} |
| 36 |
+ NotPpc64le = testRequirement{
|
|
| 37 |
+ func() bool { return os.Getenv("DOCKER_ENGINE_GOARCH") != "ppc64le" },
|
|
| 38 |
+ "Test requires a daemon not running on ppc64le", |
|
| 39 |
+ } |
|
| 36 | 40 |
SameHostDaemon = testRequirement{
|
| 37 | 41 |
func() bool { return isLocalDaemon },
|
| 38 | 42 |
"Test requires docker daemon to run on the same machine as CLI", |