[cli] run --rm overrides restart: always

[josephpage]

Fix#1013

I think docs is not needed because it's an intuitive behavior.

[josephpage]

All tests pass on local, why they failed with Jenkins ?

[aanand]

Your commit needs signing off:

$ git commit --amend --reuse-message=HEAD --signoff
$ git push --force

[aanand]

Also, could we get an integration test please? Thanks!

[josephpage]

@aanand Because the container is created and immediately removed by docker-compose run --rm command, it's difficult to test that the container doesn't have a restart policy.
Note that the --rm option is not tested today.

What do you think about it ?

@patch('dockerpty.start')deftest_run_service_with_restart_always(self, __):
name='simple'self.command.base_dir='tests/fixtures/restart-composefile'self.command.dispatch(['run', name, '/bin/echo', 'helloworld'], None)
service=self.project.get_service(name)
container=service.containers(one_off=True)[0]
self.assertEqual(container.get('HostConfig.RestartPolicy.Name'), 'always')
self.command.dispatch(['run', '--rm', name, '/bin/echo', 'helloworld'], None)
self.assertEqual(len(service.containers()), 0)
self.assertEqual(len(service.containers(stopped=True)), 0)

with this tests/fixtures/restart-composefile/docker-compose.yml :

simple:
image: busybox:latestrestart: always

[aanand]

Hm, good point. In that case, maybe just a unit test - use mock_client to check that create_container() is called with restart=None.

[josephpage]

Just added a unit test. Seems good to you @aanand ?

[jaimegildesagredo]

@aanand some updates here? we would need this fix merged. If I can be of some help just ping me.

[dnephin]

LGTM

[aanand]

OK, looks like the CLI code is too tightly coupled to improve that unit test without a lot of refactoring.

LGTM