Vincent Demeester
82d1aedf53
Merge pull request #36291 from yongtang/02052018-configs-test
...
Migrates several swarm configs tests from integration-cli to api tests
2018-02-13 17:24:26 +01:00
John Stephens
bf1345d0b6
Merge pull request #36268 from Microsoft/jjh/rs3-bump
...
Windows: Bump to final RS3 build number
2018-02-12 14:49:33 -08:00
Sebastiaan van Stijn
ed7d7b9b05
Update integration test to account for SwarmKit change
...
The PKCS8 changes updated the encryption on the keys so that the
`x509.IsEncryptedPEMBlock` may no longer return true because it cannot
parse the PEM block. The `keyutils` module in SwarmKit can tell whether
it is encrypted either way.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-02-12 23:25:51 +01:00
Yong Tang
3130176910
Remove docker_api_swarm_config_test.go
...
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2018-02-12 19:33:17 +00:00
Yong Tang
919be92823
Merge pull request #36284 from yongtang/02112018-update-tests
...
Migrate some update restart tests to api tests
2018-02-12 11:21:21 -08:00
Yong Tang
1bb389121d
Merge pull request #36261 from yongtang/02082018-oom-killed
...
Migrate docker_cli_oom_killed_test.go to api tests
2018-02-12 09:50:26 -08:00
Vincent Demeester
848cf75f1f
Merge pull request #36234 from yongtang/02042018-config-ls
...
Migrate config list tests from integration-cli to api tests
2018-02-12 18:36:14 +01:00
Vincent Demeester
54d56bbcf4
Merge pull request #36283 from yongtang/02052018-secrets-tests
...
Migrates several swarm secrets from integration-cli to api tests
2018-02-12 18:34:29 +01:00
Yong Tang
5b65cee915
Migrate some update restart tests to api tests
...
This fix migrates some update restart tests in
integration-cli to api tests in integration.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2018-02-12 16:23:08 +00:00
Daniel Nephin
945b786c14
Merge pull request #36285 from yongtang/02112018-session-tests
...
Migrates session tests in integration-cli to api tests
2018-02-12 11:04:49 -05:00
Yong Tang
1d40c6a899
Migrates session tests in integration-cli to api tests
...
This fix migrates session tests in integration-cli to
api tests in integration.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2018-02-11 23:14:39 +00:00
Yong Tang
3499557c9b
Remove docker_api_swarm_secret_test.go
...
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2018-02-11 21:17:25 +00:00
Yong Tang
3c21274b76
Migrate docker_cli_oom_killed_test.go to api tests
...
This fix migrates tests in integration-cli/docker_cli_oom_killed_test.go
to api tests.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2018-02-11 20:09:32 +00:00
Yong Tang
955a2b8194
Remove integration-cli/docker_cli_config_ls_test.go
...
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2018-02-11 19:26:39 +00:00
Yong Tang
6453d49d05
Remove integration-cli/docker_cli_pause_test.go
...
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2018-02-10 23:03:55 +00:00
Yong Tang
2d97f5e780
Merge pull request #36259 from yongtang/02082018-kill_test
...
Migrate TestKillDifferentUserContainer to api test
2018-02-09 13:47:35 -08:00
Daniel Nephin
5589e9cad1
Merge pull request #36260 from yongtang/02082018-inspect_test
...
Migrate docker_api_inspect_unix_test.go to integration api test
2018-02-09 13:33:51 -08:00
Yong Tang
9d55eefc1b
Merge pull request #36221 from yongtang/02032018-secret_ls
...
Migrate secret list tests from integration-cli to api tests
2018-02-09 13:29:19 -08:00
John Howard
c04504383a
Windows: Bump to final RS3 build number
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2018-02-09 11:39:57 -08:00
Yong Tang
0855922cd3
Migrate TestKillDifferentUserContainer to api test
...
This fix migrates TestKillDifferentUserContainer to api test
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2018-02-09 13:40:32 +00:00
Yong Tang
8197529ca2
Migrate docker_api_inspect_unix_test.go to integration api test
...
This fix migrates docker_api_inspect_unix_test.go to integration api test
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2018-02-09 12:56:07 +00:00
Yong Tang
42465784dc
Remove docker_cli_secret_ls_test.go from integration-cli
...
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2018-02-09 00:45:08 +00:00
Yong Tang
be24a6b11e
Migrate rename tests in integration-cli to api tests
...
This fix migrates rename tests in integration-cli to api tests
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2018-02-08 23:27:14 +00:00
Yong Tang
15001f83bd
Merge pull request #36241 from yongtang/02072018-create-tests
...
Migrate TestCreateTmpfsMountsTarget test to api test
2018-02-08 14:58:06 -08:00
Yong Tang
21c9e5701b
Merge pull request #36140 from vdemeester/integration-container-kill
...
Migrate some kill integration cli test to api tests
2018-02-08 09:55:28 -08:00
Daniel Nephin
12ff002eed
Merge pull request #36235 from yongtang/02072018-info-api-test
...
Migrates docker info tests to integration api tests
2018-02-08 09:55:08 -08:00
Vincent Demeester
6977f468bb
Migrate some calls to new client function
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2018-02-08 16:21:45 +01:00
Vincent Demeester
2227c8ad5e
Move some kill integration cli to api tests
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2018-02-08 15:26:24 +01:00
Akihiro Suda
9769ef333f
Merge pull request #36224 from dnephin/refactor-commit
...
Refactor Daemon.Commit()
2018-02-08 21:02:30 +09:00
Yong Tang
8331a1a5cf
Remove integration-cli/docker_cli_create_unix_test.go
...
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2018-02-08 00:21:29 +00:00
Tianon Gravi
3a633a712c
Merge pull request #36194 from dnephin/add-canonical-import
...
Add canonical import path
2018-02-07 13:06:45 -08:00
Daniel Nephin
daff039049
Refactor commit
...
The goal of this refactor is to make it easier to integrate buildkit
and containerd snapshotters.
Commit is used from two places (api and build), each calls it
with distinct arguments. Refactored to pull out the common commit
logic and provide different interfaces for each consumer.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2018-02-07 15:09:06 -05:00
Yong Tang
68d9beedbe
Migrates docker info tests to integration api tests
...
This fix migrates docker info tests in integration-cli
to integration tests.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2018-02-07 18:26:01 +00:00
Yong Tang
c028da3557
Migrates TestContainersAPINetworkMountsNoChown to api tests
...
This fix migrates TestContainersAPINetworkMountsNoChown from
integration-cli to api tests in integration.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2018-02-06 15:56:20 +00:00
Vincent Demeester
30a8c6c109
Merge pull request #36188 from yongtang/02012018-TestSecretInspect
...
Migrate TestSecretInspect from integration-cli to api tests
2018-02-06 15:19:08 +01:00
Daniel Nephin
4f0d95fa6e
Add canonical import comment
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2018-02-05 16:51:57 -05:00
Yong Tang
71c794d912
Migrate TestSecretInspect from integration-cli to api tests
...
This fix migrates TestSecretInspect from integration-cli to api tests
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2018-02-02 22:23:12 +00:00
Yong Tang
deae6a5c08
Remove integration-cli/docker_cli_nat_test.go
...
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2018-02-02 18:59:15 +00:00
Yong Tang
81e651c6d2
Merge pull request #36177 from yongtang/02012018-docker_api_resize_test
...
Migrate several resize tests from integration-cli to integration
2018-02-02 10:27:24 -08:00
Yong Tang
d5cbde514f
Migrate TestAPIStatsContainerGetMemoryLimit from integration-cli to api tests
...
This fix migrates TestAPIStatsContainerGetMemoryLimit from
integration-cli to api test.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2018-02-01 22:07:06 +00:00
Yong Tang
e8d1f35718
Remove integration-cli/docker_api_resize_test.go
...
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2018-02-01 16:37:01 +00:00
Vincent Demeester
5772c4b8a2
Merge pull request #36166 from yongtang/01312018-TestAPIUpdateContainer
...
Migrate TestAPIUpdateContainer from integration-cli to api tests
2018-01-31 15:02:00 -08:00
Yong Tang
8786b09c81
Remove docker_api_update_unix_test.go
...
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2018-01-31 16:10:34 +00:00
Yong Tang
9247e09944
Fix issue of ExitCode and PID not show up in Task.Status.ContainerStatus
...
This fix tries to address the issue raised in 36139 where
ExitCode and PID does not show up in Task.Status.ContainerStatus
The issue was caused by `json:",omitempty"` in PID and ExitCode
which interprate 0 as null.
This is confusion as ExitCode 0 does have a meaning.
This fix removes `json:",omitempty"` in ExitCode and PID,
but changes ContainerStatus to pointer so that ContainerStatus
does not show up at all if no content. If ContainerStatus
does have a content, then ExitCode and PID will show up (even if
they are 0).
This fix fixes 36139.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2018-01-31 15:35:19 +00:00
Yong Tang
5e7a245c3f
Merge pull request #36148 from yongtang/01302018-TestLinksEtcHostsContentMatch
...
Migrate some integration-cli test to api tests
2018-01-30 13:38:15 -08:00
Yong Tang
d924755789
Migrate TestAuthAPI from integration-cli to integration
...
This fix migrates TestAuthAPI from integration-cli to integration
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2018-01-30 19:15:06 +00:00
Yong Tang
e6bd20edcb
Migrate some integration-cli test to api tests
...
This fix migrate TestLinksEtcHostsContentMatch
to api test.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2018-01-30 18:52:48 +00:00
Yong Tang
4f378124ff
Migrate docker_cli_stop_test.go to api test
...
This fix migrate docker_cli_stop_test.go to api test
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2018-01-30 00:55:18 +00:00
Sebastiaan van Stijn
d1c34831e9
Fixes for libcontainer changes
...
Libcontainer no longer provides placeholders for
unsupported platforms, which cause the Windows
builds to fail.
This patch moves features that are not supported
to platform-specific files.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-01-18 10:08:12 +01:00
Yong Tang
8c31aacebf
Merge pull request #36018 from thaJeztah/remove-deprecated-testenv-functions
...
Remove deprecated integration-cli/environment functions
2018-01-15 13:24:52 -08:00