centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-04-01 16:58:54 +07:00
Code Issues Packages Projects Releases Wiki Activity
1,431 Commits 55 Branches 28 Tags
8a00a5ff103f51b32d6ee3c77f18476a80ecf16f
Commit Graph

153 Commits

Author SHA1 Message Date
Andrea Luzzardi
f49fc12ff3 Merge pull request #719 from aluzzardi/regression-tests 
Regression tests
 2015-05-06 16:13:01 -07:00
Andrea Luzzardi
95511f1074 integration: force start_docker_with_busybox to only take the latest tag 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-06 15:47:53 -07:00
Andrea Luzzardi
cfbb555bba integration: cleanup debug echo and test names 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-06 15:47:28 -07:00
Andrea Luzzardi
c75992a3bd integration: faster. faster. faster. 
- Use start_with_busybox everywhere it's possible.
- Start only what we need.
- Improved correctness of a few tests at the same time.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-06 10:51:07 -07:00
Andrea Luzzardi
0bf6cf6dc9 integration helpers: add start_with_busybox 
starts an engine with a preloaded busybox without pulling (much faster).

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-06 10:51:07 -07:00
Andrea Luzzardi
7865004ec9 Merge pull request #725 from aluzzardi/discovery-integration-cleanup 
Discovery integration cleanup
 2015-05-06 10:50:11 -07:00
Andrea Luzzardi
fad492bc41 integration: run the API test suite by default 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-06 00:35:55 -07:00
Andrea Luzzardi
85464cdc7c integration: split api into individual tests 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-06 00:35:55 -07:00
Andrea Luzzardi
75c54c22a1 integration helpers: allow tests to be located in subdirectories. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-06 00:35:02 -07:00
Andrea Luzzardi
8b89d8b615 integration: split api into individual tests 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-06 00:12:57 -07:00
Victor Vieux
09da40e0cc Merge pull request #726 from aluzzardi/integration-naming-cleanup 
integration: merge version-and-commits and main into cli.
 2015-05-05 23:52:56 -07:00
Andrea Luzzardi
68b8bfbe16 Merge pull request #663 from jimmyxian/add-events-search-stats-version-wait-integration-test 
Add events/search/stats/version/wait integration test
 2015-05-05 20:34:42 -07:00
Andrea Luzzardi
ef1a1077cf Merge pull request #720 from jimmyxian/fix-attach-websocket 
bug fix: attach through websocket integration test
 2015-05-05 20:20:07 -07:00
Xian Chaobo
b0b2290e25 using output instead of lines 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-05-05 23:13:58 -04:00
Andrea Luzzardi
eb4df9db00 integration: merge version-and-commits and main into cli. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-05 19:52:25 -07:00
Xian Chaobo
b5756d6018 check pull status 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-05-05 22:40:14 -04:00
Andrea Luzzardi
2815f100bd Merge pull request #724 from vieux/fix_affinity_images_test 
fix affinities.bats and add test in affinity_test.go
 2015-05-05 19:32:47 -07:00
Andrea Luzzardi
a2703e0562 integration: helpers cleanup. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-05 19:19:10 -07:00
Andrea Luzzardi
3501e45f4f integration: Improved discovery testing. 
Verify that swarm can see new nodes joining discovery.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-05 19:14:59 -07:00
Andrea Luzzardi
4ac91fd7cd integration helpers: Revamped swarm join/manage. 
- swarm_join can be called multiple times. Only new nodes will join the
  discovery.
- swarm_join won't return until the nodes are visible in discovery
  (swarm list).
- swarm_manage won't return until the nodes are visible in the manager.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-05 18:35:16 -07:00
Andrea Luzzardi
bd3c5c3636 Revert "use retry to wait for swarm join" 
This reverts commit 89fe217e12.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>

Conflicts:
	test/integration/helpers.bash
 2015-05-05 18:35:09 -07:00
Xian Chaobo
f6254241df using docker_host instead of docker 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-05-05 21:09:25 -04:00
Xian Chaobo
2e874d3148 fix issue: #701 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-05-05 21:08:01 -04:00
Victor Vieux
9d267e5285 fix affinities.bats 
and add affinity_test.go

Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-05-05 17:58:13 -07:00
Victor Vieux
83ed309da6 do not use -f in tests 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-05-05 16:08:38 -07:00
Andrea Luzzardi
bca0e2e8c2 integration: cleanup discovery tests 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-05 16:06:41 -07:00
Alexandre Beslic
92abcac33c Merge pull request #706 from jimmyxian/bug-fix-exec 
bug fix: check status code in exec
 2015-05-05 14:32:39 -07:00
Andrea Luzzardi
e6d853326f regression tests: Initial version. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-05 14:10:56 -07:00
Xian Chaobo
a313f46bb8 add test when container is not running 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-05-05 04:55:17 -04:00
Andrea Luzzardi
1187069407 integration: fix nodes patterns in docker_swarm info 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-05 00:20:22 -07:00
Andrea Luzzardi
b7413d3138 integration helpers: fix the wait for docker join 
It used to output `[: -eq: unary operator expected` since the grep
command didn't give any output, therefore generating a syntax error.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-04 23:52:34 -07:00
Andrea Luzzardi
389da48e5e integration: skip dependency tests 
They rely on docker inspect --format and it's currently broken on docker
master.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-04 23:22:46 -07:00
Andrea Luzzardi
2605eff5fc discovery integration: fix for docker master 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-04 23:20:42 -07:00
Andrea Luzzardi
88033393ba api integration: Fixes for docker master. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-04 23:17:29 -07:00
Andrea Luzzardi
5d10f47b32 integration helpers: move the docker_ functions together 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-04 23:17:29 -07:00
Andrea Luzzardi
b4af7acd83 integration: Run tests using docker master. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-04 23:17:29 -07:00
Andrea Luzzardi
3bb37e671a integration runner: Use the same CLI as the one available in the image. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-04 23:17:29 -07:00
Andrea Luzzardi
2ba8acbaca integration: Ensure the client and server are running the same version. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-04 23:17:29 -07:00
Andrea Luzzardi
86bf53a504 integration: Support using a different CLI. 
- `docker` will now use the CLI defined in $DOCKER_BINARY
- In order to communicate with the host docker, one must use
  `docker_host`

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-04 23:17:29 -07:00
Andrea Luzzardi
fdf74cef2a Merge pull request #465 from chanwit/test-create-cluster-on-hub 
integration: add a test to verify creating cluster on hub
 2015-05-04 22:00:37 -07:00
Chanwit Kaewkasi
6ecf51f458 add integration test for token discovery 
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
 2015-05-05 11:44:47 +07:00
Chanwit Kaewkasi
89fe217e12 use retry to wait for swarm join 
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
 2015-05-05 11:44:47 +07:00
Xian Chaobo
35026de4c4 bug fix 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-05-05 12:31:09 +08:00
Andrea Luzzardi
4b3bc9b35b integration: Fix tests in jenkins. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-04 20:35:56 -07:00
Andrea Luzzardi
6df673372f integration: Use aufs by default. 
The problem has been fixed in the dind images.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-04 17:29:00 -07:00
Andrea Luzzardi
a2862280f1 integration: Added missing dependency to Dockerfile. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-04 17:25:02 -07:00
Andrea Luzzardi
97aad7e60c fix attach integration test 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-04 15:18:03 -07:00
Andrea Luzzardi
c236e2f11d integration runner: run tests on a fresh binary. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-04 14:46:00 -07:00
Andrea Luzzardi
2600c8823b integration tests: Support for running within Docker. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-04 14:46:00 -07:00
Andrea Luzzardi
f50af455fa integration tests: Don't build binaries anymore, it's too slow. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-04 14:20:28 -07:00