0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
36980 commits 14 branches 412 tags 338 MiB
Commit graph

32 commits

Author SHA1 Message Date
Sebastiaan van Stijn
6345208b9b
Replace some checkers and assertions with gotest.tools 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-04-05 16:45:37 +02:00
Sebastiaan van Stijn
3105ca26dc
integration-cli: remove deprecated daemonHost() utility 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-01-21 12:07:36 +01:00
Sebastiaan van Stijn
c8ff5ecc09
Remove use of deprecated client.NewEnvClient() 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-01-03 22:49:00 +01:00
Yong Tang
bd5eb6b402
Merge pull request #36612 from kolyshkin/t-attach 
TestPostContainersAttach: minor improvements
 2018-05-08 03:26:25 +02:00
Kir Kolyshkin
ecc54889c9 TestPostContainerAttach: minor improvements 
When this test fails, the error looks like this:

> FAIL: docker_api_attach_test.go:98: DockerSuite.TestPostContainersAttach
> docker_api_attach_test.go:211:
>     c.Assert(actualStdout.Bytes(), checker.DeepEquals, []byte("hello\nsuccess"), check.Commentf("Attach didn't return the expected data from stdout"))
> ... obtained []uint8 = []byte{0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73}
> ... expected []uint8 = []byte{0x68, 0x65, 0x6c, 0x6c, 0x6f, 0xa, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73}
> ... Attach didn't return the expected data from stdout

Let's use strings for comparisons to make the output more readable.

While at it,
- get the container's stderr as well, and make sure it's empty;
- check that stdcopy.StdCopy() did not return an error, except for
  the timeout which is expected;
- move/remove comments, simplify var names.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
 2018-05-03 10:15:48 -07:00
Vincent Demeester
42f6fdf059
Move integration-cli/request to internal/test/request… 
… and change a bit the method signature

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2018-04-17 16:25:59 +02:00
Daniel Nephin
0a91ba2d8c Remove duplicate calls for getting an APIClient 
Remove request.SockRequest
Remove request.SockRequestHijack
Remove request.SockRequestRaw()
Remove deprecated ParseHost
Deprecate and unexport more helpers

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2018-02-20 17:27:24 -05:00
Stanislav Bondarenko
0fd5a65428 Stop using deprecated SockRequest 
Signed-off-by: Stanislav Bondarenko <stanislav.bondarenko@gmail.com>
 2017-08-23 17:10:04 -04:00
Daniel Nephin
4f304e72a2 Remove testutil.ReadBody 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-08-22 17:15:26 -04:00
Daniel Nephin
f1ade82d82 Fix Cache with ONBUILD 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-06-06 10:52:29 -04:00
Vincent Demeester
d69d4799a3
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>
 2017-01-03 11:49:30 +01:00
Vincent Demeester
33968e6c7d
Remove pkg/integration and move it to testutil or integration-cli 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-12-30 18:26:34 +01:00
Vincent Demeester
48de91a33f Extract daemon to its own package 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-12-09 22:26:42 +01:00
Andy Goldstein
fc8097f957 Add Logs to ContainerAttachOptions 
Signed-off-by: Andy Goldstein <agoldste@redhat.com>
 2016-10-19 11:39:00 -04:00
Tonis Tiigi
0d88d5b64b Swarm integration tests 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-06-13 22:16:18 -07:00
Ben Firshman
322e2a7d05 Return remote API errors as JSON 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-06-07 18:45:27 -07:00
Zhang Wei
91e5bb9541 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>
 2016-04-04 15:35:55 +08:00
Tonis Tiigi
85354fb77c Fix flaky TestGetContainersAttachWebsocket 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-03-31 11:31:48 -07:00
Justas Brazauskas
927b334ebf Fix typos found across repository 
Signed-off-by: Justas Brazauskas <brazauskasjustas@gmail.com>
 2015-12-13 18:04:12 +02:00
Wen Cheng Ma
c424c8c32c Correct the message of ErrorCodeNoSuchContainer to "No such container" 
Fixes issue #18424

Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
 2015-12-04 15:00:08 +08:00
Shijiang Wei
4f6f46a11d refacter attach API tests to use checkers 
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
 2015-10-27 16:20:06 +08:00
Shijiang Wei
13364cd431 fix the flaws in the test of the attach API 
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
 2015-10-11 23:40:16 +08:00
John Howard
f9a3558a9d Windows: Get Integration CLI running 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-09-04 12:32:40 -07:00
Vincent Demeester
5c295460da 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>
 2015-07-14 21:52:43 +02:00
Megan Kostick
a8715ea220 Port POST container attach tests 
Signed-off-by: Megan Kostick <mkostick@us.ibm.com>
 2015-07-09 12:52:45 -07:00
Antonio Murdaca
88d32a6109 Fix regression in containers attach/wsattach api, return not found before hijacking 
Signed-off-by: Antonio Murdaca <runcom@linux.com>
 2015-07-01 18:16:17 +02:00
Tibor Vass
d820e00aac Update vendored go.net to use golang.org/x/net canonical path 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2015-06-16 11:40:04 -04:00
Antonio Murdaca
c7b2632dc8 Remove c.Fatal from goroutine in TestGetContainersAttachWebsocket 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-27 13:56:55 +02:00
Alexander Morozov
dc944ea7e4 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>
 2015-04-21 10:28:52 -07:00
Brian Goff
475c65319b Remove stripTrailingCharacters from tests 
This was just an alias to `strings.TrimSpace`

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-04-06 09:21:18 -04:00
Ahmet Alp Balkan
ac6cb41d52 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>
 2015-02-12 15:11:19 -08:00
Andrew C. Bodine
9e37a04665 Adds test for api attach via websocket 
Signed-off-by: Andrew C. Bodine <acbodine@us.ibm.com>
 2015-01-21 18:35:51 -08:00