p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
33,074 Commits 2 Branches 295 Tags
ed052d78fda5f3668e9e66b82f03456fca015d19
Commit Graph

23 Commits

Author SHA1 Message Date
Daniel Nephin
a7fe10a440 Fix Cache with ONBUILD 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: f1ade82d82e6436971c6b7d08eb1da57ed9ba756
Component: engine
 2017-06-06 10:52:29 -04:00
Vincent Demeester
44a6bbe938 Add a new request package in integration-cli 
The goal is to remove function from `docker_utils.go` and setup
simple, one-responsability package that can be well tested ; and to
ease writing request.

This moves all the calls to `sockRequest` (and similar methods) to
their counterpart in the `request` package.

This introduce `request.Do` to write easier request (with functional
argument to easily augment the request) with some pre-defined function
for the most used http method (i.e. `request.Get`, `request.Post` and
`request.Delete`).

Few of the `sockRequest` call have been moved to `request.Do` (and
`Get`, etc.) to showcase the usage of the package. There is still a
whole lot to do.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: d69d4799a312dfcae63442e290ae6667afd1a038
Component: engine
 2017-01-03 11:49:30 +01:00
Vincent Demeester
2758f0996d Remove pkg/integration and move it to testutil or integration-cli 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 33968e6c7df164fff0a882c50ae7f4f7e6190e4b
Component: engine
 2016-12-30 18:26:34 +01:00
Vincent Demeester
71651385ac Extract daemon to its own package 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 48de91a33f097d4c20515088af1f5bcb9a98c5c9
Component: engine
 2016-12-09 22:26:42 +01:00
Andy Goldstein
3c2827770b Add Logs to ContainerAttachOptions 
Signed-off-by: Andy Goldstein <agoldste@redhat.com>
Upstream-commit: fc8097f957ec7ae990f84faf54bce85a399c96af
Component: engine
 2016-10-19 11:39:00 -04:00
Tonis Tiigi
7a33d63cb2 Swarm integration tests 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 0d88d5b64b69a451d374e322b2abe64140a6cd1c
Component: engine
 2016-06-13 22:16:18 -07:00
Ben Firshman
ecda48bde7 Return remote API errors as JSON 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
Upstream-commit: 322e2a7d059a81617b593cf6ece2cfd9f6d4ea03
Component: engine
 2016-06-07 18:45:27 -07:00
Zhang Wei
97016757fb Let client print error when speicify wrong detach keys 
Fix #21064

Let client print error message explicitly when user specifies wrong
detach keys.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 91e5bb954131904af150b06bd22b007559a8ce27
Component: engine
 2016-04-04 15:35:55 +08:00
Tonis Tiigi
f7de49cf41 Fix flaky TestGetContainersAttachWebsocket 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 85354fb77c77aabe6ba1f53c90aa2395b4e81866
Component: engine
 2016-03-31 11:31:48 -07:00
Justas Brazauskas
3c4fcf6b7a Fix typos found across repository 
Signed-off-by: Justas Brazauskas <brazauskasjustas@gmail.com>
Upstream-commit: 927b334ebfc786276a039e45ec097e71bf9a104c
Component: engine
 2015-12-13 18:04:12 +02:00
Wen Cheng Ma
cae2a5b6ac Correct the message of ErrorCodeNoSuchContainer to "No such container" 
Fixes issue #18424

Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
Upstream-commit: c424c8c32c86d5e02964ad84802e9f9fa4e55522
Component: engine
 2015-12-04 15:00:08 +08:00
Shijiang Wei
022782c7fa refacter attach API tests to use checkers 
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
Upstream-commit: 4f6f46a11d9a8588d1e21f5cb543bb9c7181fec3
Component: engine
 2015-10-27 16:20:06 +08:00
Shijiang Wei
9493e88e03 fix the flaws in the test of the attach API 
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
Upstream-commit: 13364cd431578abb5d233f0279337c0b122071ed
Component: engine
 2015-10-11 23:40:16 +08:00
John Howard
c03ccb6893 Windows: Get Integration CLI running 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: f9a3558a9d75ed6a2f9f1b2d80800226afaa74a5
Component: engine
 2015-09-04 12:32:40 -07:00
Vincent Demeester
abe73960d5 Use dockerCmd when possible (#14603) 
- integration-cli/docker_cli_attach_test.go
- integration-cli/docker_cli_attach_unix_test.go
- integration-cli/docker_cli_build_test.go
- integration-cli/docker_cli_build_unix_test.go
- integration-cli/docker_cli_by_digest_test.go
- integration-cli/docker_cli_commit_test.go
- integration-cli/docker_cli_config_test.go
- integration-cli/docker_cli_cp_test.go
- integration-cli/docker_cli_create_test.go
- integration-cli/docker_cli_pause_test.go
- integration-cli/docker_cli_port_test.go
- integration-cli/docker_cli_port_unix_test.go
- integration-cli/docker_cli_proxy_test.go
- integration-cli/docker_cli_ps_test.go
- integration-cli/docker_cli_pull_test.go
- integration-cli/docker_cli_push_test.go

- docker_api_attach_test.go
- docker_api_containers_test.go
- docker_api_events_test.go
- docker_api_exec_resize_test.go
- docker_api_exec_test.go
- docker_api_images_test.go
- docker_api_info_test.go

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 5c295460da2098d971eda28a73b416ff6be62f53
Component: engine
 2015-07-14 21:52:43 +02:00
Megan Kostick
f35886e35f Port POST container attach tests 
Signed-off-by: Megan Kostick <mkostick@us.ibm.com>
Upstream-commit: a8715ea2207966e649e66a4fafcf34517234061f
Component: engine
 2015-07-09 12:52:45 -07:00
Antonio Murdaca
5607e48f25 Fix regression in containers attach/wsattach api, return not found before hijacking 
Signed-off-by: Antonio Murdaca <runcom@linux.com>
Upstream-commit: 88d32a6109a15633481f758c4d0689516ae58aef
Component: engine
 2015-07-01 18:16:17 +02:00
Tibor Vass
fa9ff55406 Update vendored go.net to use golang.org/x/net canonical path 
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: d820e00aac2376d4e01721557b9af5e482ec89cd
Component: engine
 2015-06-16 11:40:04 -04:00
Antonio Murdaca
e570165119 Remove c.Fatal from goroutine in TestGetContainersAttachWebsocket 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: c7b2632dc8550c8aa80ebd8b229809ac37fa53e1
Component: engine
 2015-04-27 13:56:55 +02:00
Alexander Morozov
1884ef3b9b Use suite for integration-cli 
It prints test name and duration for each test.
Also performs deleteAllContainers after each test.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: dc944ea7e48d11a2906e751d3e61daf08faee054
Component: engine
 2015-04-21 10:28:52 -07:00
Brian Goff
ab9a366f0e Remove stripTrailingCharacters from tests 
This was just an alias to `strings.TrimSpace`

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 475c65319b4663d630711519e18d0b134c42c7f1
Component: engine
 2015-04-06 09:21:18 -04:00
Ahmet Alp Balkan
b8472e6ec6 docker_api_attach_test: fix WS test to use DOCKER_TEST_HOST if specified 
TestGetContainersAttachWebsocket is currently broken on Windows CI tests
b/c it has hardcoded unix://var/run/docker.sock.  This change makes use
of @icecrime's code in docker_utils and generalizes it with sockConn()
to provide a net.Conn by making use of DOCKER_TEST_HOST. Also fixes
the test.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: ac6cb41d52ca229d2b628ab0bb5ef6103bd86ce1
Component: engine
 2015-02-12 15:11:19 -08:00
Andrew C. Bodine
24e8380b6a Adds test for api attach via websocket 
Signed-off-by: Andrew C. Bodine <acbodine@us.ibm.com>
Upstream-commit: 9e37a04665395cb98687cd09b05ba33736984547
Component: engine
 2015-01-21 18:35:51 -08:00