[17.06] cherry-pick Fix prefix-matching for service ps

[andrewhsu]

Cherry-pick of:

• Fix prefix-matching for service ps docker/cli#72 Fix prefix-matching for service ps

[andrewhsu]

Seeing failure in test result:

01:00:52.064 [DockerSwarmSuite] FAIL: docker_cli_swarm_test.go:1690: DockerSwarmSuite.TestSwarmServicePsMultipleServiceIDs
01:00:52.064 [DockerSwarmSuite] 
01:00:52.064 [DockerSwarmSuite] [d586526176fbf] waiting for daemon to start
01:00:52.064 [DockerSwarmSuite] [d586526176fbf] daemon started
01:00:52.064 [DockerSwarmSuite] 
01:00:52.064 [DockerSwarmSuite] docker_cli_swarm_test.go:1728:
01:00:52.064 [DockerSwarmSuite]     c.Assert(err, checker.IsNil)
01:00:52.064 [DockerSwarmSuite] ... value *exec.ExitError = &exec.ExitError{ProcessState:(*os.ProcessState)(0xc420218000), Stderr:[]uint8(nil)} ("exit status 1")
01:00:52.064 [DockerSwarmSuite] 
01:00:52.064 [DockerSwarmSuite] [d586526176fbf] exiting daemon

[dnephin]

I fixed the test to use the proper exec helpers and I can't reproduce the failure, so I guess it's a flake. I'll push the test changes to this branch just in case it isn't.

[thaJeztah]

@dnephin should those fixes be backported to moby/moby?

[dnephin]

Yes, PR already open: moby/moby#33684 😄

[thaJeztah]

Ugh; CI needs a kick;

22:34:47 [init] curl: (22) The requested URL returned error: 400 Bad Request
22:34:47 [init] The command '/bin/sh -c ./contrib/download-frozen-image-v2.sh /docker-frozen-images 	buildpack-

[andrewhsu]

@dnephin with the test debug commit, failed at the same test:

00:57:59.454 FAIL: docker_cli_swarm_test.go:1690: DockerSwarmSuite.TestSwarmServicePsMultipleServiceIDs
00:57:59.454 
00:57:59.454 [d62ec432a3a1c] waiting for daemon to start
00:57:59.454 [d62ec432a3a1c] daemon started
00:57:59.454 
00:57:59.454 docker_cli_swarm_test.go:1730:
00:57:59.454     result.Assert(c, icmd.Success)
00:57:59.454 /go/src/github.com/docker/docker/pkg/testutil/cmd/command.go:64:
00:57:59.454     t.Fatalf("at %s:%d - %s", filepath.Base(file), line, err.Error())
00:57:59.454 ... Error: at docker_cli_swarm_test.go:1730 - 
00:57:59.454 Command:  /usr/local/cli/docker --host unix:///tmp/docker-integration/d62ec432a3a1c.sock service ps to
00:57:59.454 ExitCode: 1
00:57:59.454 Error:    exit status 1
00:57:59.454 Stdout:   
00:57:59.454 Stderr:   no such service: to
00:57:59.454 
00:57:59.454 
00:57:59.454 Failures:
00:57:59.454 ExitCode was 1 expected 0
00:57:59.454 Expected no error
00:57:59.454 
00:57:59.454 
00:57:59.454 [d62ec432a3a1c] exiting daemon

[thaJeztah]

I suspect that we need the integration test updates from moby/moby#32800, because current tests test for the faulty behaviour 😞

[dnephin]

Test fixed in dnephin@09b3718 I think.

[GordonTheTurtle]

Please sign your commits following these rules:
https://github.com/moby/moby/blob/master/CONTRIBUTING.md#sign-your-work
The easiest way to do this is to amend the last commit:

$ git clone -b "ps" git@github.com:andrewhsu/docker-ce.git somewhere
$ cd somewhere
$ git rebase -i HEAD~842354081488
editor opens
change each 'pick' to 'edit'
save the file and quit
$ git commit --amend -s --no-edit
$ git rebase --continue # and repeat the amend for each commit
$ git push -f

Amending updates the existing PR. You DO NOT need to open a new one.

[andrewhsu]

@thaJeztah punting this to 17.06.1

@dnephin i think we talked about this one earlier about splitting out the test that failed into an api test instead of an integration-cli test. would also desire a cherry-pick of something that is already in master branch of moby/moby.

[dnephin]

I tried... moby/moby#33684

First I applied this patch to moby/moby, but @thaJeztah pointed out that it doesn't make sense to merge this fix into master, because it shouldn't be testing with the CLI anymore. Now it's just an API test, but it's being met with some resistance.

[andrerom]

Somewhat related given the resistance/test-failures: Any chance of 17.06.1 being releases soon? kind of solves a few blockers, so if this is not one, maybe it can be moved to an 17.06.2 milestone given .1 is already in very late rc stage?

[andrewhsu]

Closing this PR because the docker-ce 17.06 code-line is EoL.