7 Commits

Author	SHA1	Message	Date
Daniel Nephin	39c2ca57c1	Automated migration ... Signed-off-by: Daniel Nephin <dnephin@docker.com>	2018-03-05 19:41:17 -05:00
Daniel Nephin	846a31aa50	Use new internal testutil.ErrorContains() ... Signed-off-by: Daniel Nephin <dnephin@docker.com>	2017-08-22 10:14:25 -04:00
Vincent Demeester	d7f6563efc	Update cli imports to using local package ... Also, rename a bunch of variable to not *shadow* the `opts` package name. Signed-off-by: Vincent Demeester <vincent@sbr.pm>	2017-05-15 14:45:19 +02:00
Aaron Lehmann	eb366ae039	Remove pkg/testutil/assert in favor of testify ... I noticed that we're using a homegrown package for assertions. The functions are extremely similar to testify, but with enough slight differences to be confusing (for example, Equal takes its arguments in a different order). We already vendor testify, and it's used in a few places by tests. I also found some problems with pkg/testutil/assert. For example, the NotNil function seems to be broken. It checks the argument against "nil", which only works for an interface. If you pass in a nil map or slice, the equality check will fail. In the interest of avoiding NIH, I'm proposing replacing pkg/testutil/assert with testify. The test code looks almost the same, but we avoid the confusion of having two similar but slightly different assertion packages, and having to maintain our own package instead of using a commonly-used one. In the process, I found a few places where the tests should halt if an assertion fails, so I've made those cases (that I noticed) use "require" instead of "assert", and I've vendored the "require" package from testify alongside the already-present "assert" package. Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>	2017-05-15 11:57:21 +02:00
Vincent Demeester	7fa9161585	Make sure we validate simple syntax on service commands ... We ignored errors for simple syntax in `PortOpt` (missed that in the previous migration of this code). This make sure we don't ignore `nat.Parse` errors. Test has been migrate too (errors are not exactly the same as before though -_-) Signed-off-by: Vincent Demeester <vincent@sbr.pm>	2017-05-15 11:57:21 +02:00
Vincent Demeester	16bbd3441a	Make --publish-rm precedes --publish-add, so that add wins ... `--publish-add 8081:81 --publish-add 8082:82 --publish-rm 80 --publish-rm 81/tcp --publish-rm 82/tcp` would thus result in 81 and 82 to be published. Signed-off-by: Vincent Demeester <vincent@sbr.pm>	2017-05-15 11:57:20 +02:00
Vincent Demeester	016a56b064	Remove --port and update --publish for services to support syntaxes ... Add support for simple and complex syntax to `--publish` through the use of `PortOpt`. Signed-off-by: Vincent Demeester <vincent@sbr.pm>	2017-05-15 11:57:20 +02:00