If the empty variable happens to be sorted to the end of the list then TrimSpace() would remove it. Instead only strip the single trailing newline. Signed-off-by: Daniel Nephin <dnephin@docker.com>
@@ -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{