38989f71ca
Merge pull request #12690 from rajdeepd/dry-run-test
...
Container API Test with HostName
Upstream-commit: 03e77e5c8fe90ee7620f2198d140eca7bed23ab8
Component: engine
2015-04-23 11:32:47 -07:00
68210d0ad0
Merge pull request #12692 from cpuguy83/fix_commit_test
...
Fix race with TestContainerApiCommit
Upstream-commit: 59acccb6f2dae4659797636196dfde7263789923
Component: engine
2015-04-23 11:31:27 -07:00
2b16b6e81b
Merge pull request #12646 from duglin/validateTests
...
Validate we're not using the old testing stuff
Upstream-commit: d17f2baa811e06dcf70b989c1a84de66da327f12
Component: engine
2015-04-23 11:23:20 -07:00
2c94df895a
Validate we're not using the old testing stuff
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: ecccfa82aa22829c52778c4457cacd8d766e3dda
Component: engine
2015-04-23 10:29:47 -07:00
dd4b0467ca
Remove deleteAllContainers call in test
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: ee7a7b07e752c56bbe1b941feb1e4313275d68c2
Component: engine
2015-04-23 16:32:50 +02:00
407d8746a2
TestCase added for Container Create with HostName
...
Signed-off-by: Rajdeep Dua <dua_rajdeep@yahoo.com >
Upstream-commit: fca4aea077f1960a0cdd0056477730b3f8e0ca38
Component: engine
2015-04-23 06:53:34 -07:00
a10a6cc648
Fix race with TestContainerApiCommit
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 563708d78d42afe89374d5819fdb671ed72c2dad
Component: engine
2015-04-23 09:45:06 -04:00
b609417259
Merge pull request #12680 from Mashimiao/fix-typo-push-test
...
push test: fix typo
Upstream-commit: f4cfaac5190bd52dc63948e781065d0519b0f686
Component: engine
2015-04-23 07:37:50 -04:00
0b4dffa97c
push test: fix typo
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
Upstream-commit: 62f91b1d34155a58bfeb6ce8d3595149cf5147d7
Component: engine
2015-04-23 16:50:41 +08:00
0b0a96ad89
Merge pull request #12390 from hqhq/hq_fix_inspect
...
fix inspect format result
Upstream-commit: eae272f90eb6c01824112054140b5dc7d9d679ce
Component: engine
2015-04-22 23:06:13 -04:00
eaff99d710
Merge pull request #12582 from ankushagarwal/add-docker-history-integration-test
...
Add integration test for history option
Upstream-commit: 6bacb4528eca2d491d261bd6fb5b76022bf0d058
Component: engine
2015-04-22 22:09:01 -04:00
1c1b244ecd
fix inspect format result
...
Currently `docker inspect -f` use json.Unmarshal() unmarshal
to interface, it will store all JSON numbers in float64, so
we use `docker inspect 4f0d73b75a0d | grep Memory` and
`docker inspect -f {{.HostConfig.Memory}} 4f0d73b75a0d` will
get different values.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: b0ef3194aaa8c22b674ed5301c59e8e557a7e85e
Component: engine
2015-04-23 09:28:07 +08:00
2ce3beecbf
Merge pull request #12654 from jfrazelle/12135-docker-delete-multiple-tagged
...
add regression test for rmi multiple tags without f
Upstream-commit: 480d979c27228671838d8e5624cc92a576a4cacd
Component: engine
2015-04-22 21:08:07 -04:00
078d379cc0
Merge pull request #12406 from runcom/remove-job-container-inspect
...
Remove job from container_inspect
Upstream-commit: 387227217004d4ea54e2d2405aaef761752e3bdc
Component: engine
2015-04-22 21:05:15 -04:00
9b8b781646
Merge pull request #12649 from jlhawn/fix_pull_err_explosion
...
Correctly format API error on image pull
Upstream-commit: 5ea8dc376c94de6939e35a4152b1a9a5979911dd
Component: engine
2015-04-22 20:28:24 -04:00
628a79ad40
Cleanup daemon/volumes
...
- Mount struct now called volumeMount
- Merged volume creation for each volume type (volumes-from, binds, normal
volumes) so this only happens in once place
- Simplified container copy of volumes (for when `docker cp` is a
volume)
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: f3680e74946d3a773edb118ea3f508b8237e44a8
Component: engine
2015-04-22 19:32:10 -04:00
fdf9a8d629
Remove job from container_inspect
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 4b9fe9c298c8778855c1d14e978c791496dd7c42
Component: engine
2015-04-23 00:58:13 +02:00
9099ab32e6
add regression test for rmi multiple tags without f
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
Upstream-commit: 28f5541b72a898762575a2ed0995cae7452fa275
Component: engine
2015-04-22 14:23:05 -07:00
f72daf37a9
add integration test for error pull nonexistent
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
Upstream-commit: 7a525c6cb74af854d621f5560868b32694d2553b
Component: engine
2015-04-22 14:11:25 -07:00
3779d0ae84
Merge pull request #12621 from LK4D4/test_push_interrupt_daemon
...
Run TestPushInterrupt on separate daemon
Upstream-commit: 29265448ecaf7721b24cbc64978bc7e2adbc4c08
Component: engine
2015-04-22 14:05:37 -07:00
1114daff30
Wait until all pushes are done in TestPushInterrupt
...
Background pushes affects other tests
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: c09765ac431a85f9ad231c52cbe562bb6f0b0b06
Component: engine
2015-04-22 13:36:43 -07:00
e75be891ca
Add integration test for history option
...
Parse the history output to locate the size fields and check
whether they are the correct format or not. Use Column name SIZE
to mark start and end indices of the size fields
Fixes #12578
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com >
Upstream-commit: 08150150bbc4477cbcf8286bc15a1cf8b4428e35
Component: engine
2015-04-22 12:22:01 -07:00
5f7ff29c8f
Remove old testing stuff that slipped into master
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: b4988d8d75b4ee915ade6013de76bb1336917528
Component: engine
2015-04-22 11:44:54 -07:00
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
cff18dc122
Merge pull request #10736 from coolljt0725/add_cpu_limit
...
Add support cpu cfs_quota
Upstream-commit: 17d5450bc31e81c22e8ccba806294e4d744af275
Component: engine
2015-04-20 17:55:01 -07:00
40cdee7b30
Merge pull request #12517 from mavenugo/master
...
Enhanced port integration-cli tests
Upstream-commit: 874d64e690338a7aba3e8e4ecff793f1893bdb9d
Component: engine
2015-04-20 17:26:48 -07:00
e0b5db7169
Merge pull request #12450 from brahmaroutu/integration_test3_12255
...
Port test from integration tests - test low memory on create
Upstream-commit: 435643545c4b2c90e2a0a264527f6cc190d925cb
Component: engine
2015-04-20 17:27:17 -04:00
d6cf7ae01f
Merge pull request #12009 from duglin/AddConfig
...
Migrate .dockercfg to .docker/config.json and support for HTTP Headers
Upstream-commit: 08ef006d178b7a869c9dfc05c8b887316a856445
Component: engine
2015-04-20 13:12:17 -07:00
44c88b9112
Add .docker/config.json and support for HTTP Headers
...
This PR does the following:
- migrated ~/.dockerfg to ~/.docker/config.json. The data is migrated
but the old file remains in case its needed
- moves the auth json in that fie into an "auth" property so we can add new
top-level properties w/o messing with the auth stuff
- adds support for an HttpHeaders property in ~/.docker/config.json
which adds these http headers to all msgs from the cli
In a follow-on PR I'll move the config file process out from under
"registry" since it not specific to that any more. I didn't do it here
because I wanted the diff to be smaller so people can make sure I didn't
break/miss any auth code during my edits.
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 18c9b6c6455f116ae59cde8544413b3d7d294a5e
Component: engine
2015-04-20 13:05:24 -07:00
9d60a63dde
Merge pull request #12561 from sergeyevstifeev/12549-fix-test-requires-network
...
Add missing testRequires(t, Network)
Upstream-commit: cfe7c9c1b24a965985eb54d10fa114e339a95e0b
Component: engine
2015-04-20 12:58:30 -07:00
3d762e6cee
Add missing testRequires(t, Network)
...
Fixes #12552
Signed-off-by: Sergey Evstifeev <sergey.evstifeev@gmail.com >
Upstream-commit: 716e21be2b9780306cc1ffe02b2a784e2dece94e
Component: engine
2015-04-20 21:19:50 +02:00
bd79229dd5
Merge pull request #12554 from buddhamagnet/12553-cli-doc-correction
...
12553 fix typo
Upstream-commit: 53edce79f16816a165b5be9cd4ee05501c103c6f
Component: engine
2015-04-20 14:30:51 -04:00
97fb2745d9
Port test from integration tests
...
Addresses #12255
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: 1a35b16b08ef5a8b0764e5a383f36d5572f20dfe
Component: engine
2015-04-20 17:57:53 +00:00
e52ab0e055
fix typo
...
Signed-off-by: buddhamagnet <buddhamagnet@gmail.com >
Upstream-commit: cdd5d5e4c3fe241d178c09edb521ae91689b55df
Component: engine
2015-04-20 18:56:21 +01:00
f8f4bcdb38
Add support cpu cfs quota
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: dcc50e1d593fd7995189872791c6d7a013f16970
Component: engine
2015-04-20 08:16:47 -07:00
932b7d41ce
Make daemon initialization in main goroutine
...
It is simplifies code and lead to next refactoring step, where daemon
will be incorporated to some structure which represents API.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 181fea24aac7499a3d6dc0c8c9de67e6c0036140
Component: engine
2015-04-20 08:13:39 -07:00
899b777d56
Remove Job from Info API
...
Two main things
- Create a real struct Info for all of the data with the proper types
- Add test for REST API get info
Signed-off-by: Hu Keping <hukeping@huawei.com >
Upstream-commit: f4942ed864f00a31591ef0257a971ef41ddd4c70
Component: engine
2015-04-20 18:14:06 +08:00
d4417b0225
Enhanced port integration-cli tests
...
THe port tests in integration-cli tests just for the port-mapping as
seen by Docker daemon. But it doesn't perform a more indepth testing by
checking for the exposed port on the host.
This change helps to fill that gap.
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 448a1a7139cf89a0f4f985ec027a93799d0befb7
Component: engine
2015-04-19 06:15:23 -07:00
ad529b2798
Merge pull request #12466 from robertabbott/fix_dockerCmd
...
Removed unnecessary error output from dockerCmd
Upstream-commit: 5fd378c0d1d97601c7cfab6a62bb8da031a0001d
Component: engine
2015-04-17 15:15:34 -07:00
41c63ff3d3
Merge pull request #12490 from LK4D4/carry_12396
...
remove job from pull and import
Upstream-commit: 055c6dbaefc61c597164aaedee4448bc32522b2e
Component: engine
2015-04-17 15:26:30 -04:00
0ff275f7b4
remove job from pull and import
...
Closes #12396
Signed-off-by: Simei He <hesimei@zju.edu.cn >
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 6e38a53f96403b4cbd38e49e6b294128ed054a20
Component: engine
2015-04-17 09:55:02 -07:00
5e15f55a29
Removed unnecessary error output from dockerCmd
...
Changed method declaration. Fixed all calls to dockerCmd
method to reflect the change.
resolves #12355
Signed-off-by: bobby abbott <ttobbaybbob@gmail.com >
Upstream-commit: 621b601b3c602aab5ef0f07903fdf413881bb261
Component: engine
2015-04-17 09:11:14 -07:00
6488f10044
Remove builtins
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: a0bf80fe0372196812a9cb295f209c08f8037601
Component: engine
2015-04-17 14:27:38 +02:00
9a1ff57e85
Merge pull request #12468 from icecrime/disable_test_pull_verified
...
Skip TestPullVerified
Upstream-commit: 5e40de92864009e7385300af1dd0a83bb4693126
Component: engine
2015-04-17 02:31:01 -04:00
7e8cef686e
Skip TestPullVerified
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 9a4fa9c19167756cf39a4d002efe81d4bcd3bb75
Component: engine
2015-04-16 23:05:47 -07:00
52da95a5c0
Merge pull request #12446 from icecrime/please_go_away_testexp.tar
...
Always remove testexp.tar test file
Upstream-commit: 5207b3eb2b9894c282e46254b727aeee7e03e949
Component: engine
2015-04-17 01:58:29 -04:00
e095f708fe
Improve export/import tests cleanup
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 4e356ee410e1abb86665ab15e4c4155d7c807866
Component: engine
2015-04-16 22:10:55 -07:00
b5835957f0
Move TestPostCreateNull to integration-cli
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 308a23021d65282cdf471ef0708ba5998b48c247
Component: engine
2015-04-16 13:49:46 -04:00
6688a2d031
Move TestPostJsonVerify to integration-cli
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 5dc02a2fa8819b3a61bcd5a6fedcfb1a5e64cba5
Component: engine
2015-04-16 13:49:28 -04:00
3cb6dbb528
Move TestContainerApiCreate to integration-cli
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 23fa7d41d5510131cdf7883a930087ac4fb34187
Component: engine
2015-04-16 13:49:10 -04:00
