Merge pull request #34757 from dnephin/fix-test-run-environment

Fix TestRunEnvironment
This commit is contained in:
Yong Tang 2017-09-07 11:28:57 -07:00 committed by GitHub
commit d76f0d4e06

View file

@ -824,7 +824,7 @@ func (s *DockerSuite) TestRunEnvironment(c *check.C) {
})
result.Assert(c, icmd.Success)
actualEnv := strings.Split(strings.TrimSpace(result.Combined()), "\n")
actualEnv := strings.Split(strings.TrimSuffix(result.Stdout(), "\n"), "\n")
sort.Strings(actualEnv)
goodEnv := []string{