From fff605c3b3557acf6bf793813d695fba59d7fa21 Mon Sep 17 00:00:00 2001 From: Daniel Nephin Date: Wed, 6 Sep 2017 17:32:56 -0400 Subject: [PATCH] Fix a bad assumption 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 --- integration-cli/docker_cli_run_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration-cli/docker_cli_run_test.go b/integration-cli/docker_cli_run_test.go index 340ad4b90f..03996b3047 100644 --- a/integration-cli/docker_cli_run_test.go +++ b/integration-cli/docker_cli_run_test.go @@ -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{