Commit Graph

98 Commits

Author SHA1 Message Date
Andrea Luzzardi ad98b865b7 integration: Run engines with --net=host.
Since we were mapping the port back to the host anyway, this doesn't
change anything.

However, it does fix `docker exec`.

Fixes #658

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-04 13:36:36 -07:00
Andrea Luzzardi 3cc8a2b5fd Merge pull request #703 from aluzzardi/integration-image
integration: Use the brand new dind image.
2015-05-04 13:43:38 -07:00
Andrea Luzzardi 24aaaa029e integration: Use the brand new dind image.
We now have dockerswarm/dind:
- Much more lightweight.
- Exists in every version since Docker 1.0.0.

Depends on #700 as it cannot run on aufs.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-03 19:20:47 -07:00
Andrea Luzzardi 671ddc8feb integration tests: run with native/vfs by default.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-03 19:08:02 -07:00
Andrea Luzzardi 92f8c8ec60 Merge pull request #693 from aluzzardi/integration-retry
integration: Add the re-usable "retry" helper.
2015-05-02 16:17:38 -07:00
Andrea Luzzardi f9a03c62f1 integration: Add the re-usable "retry" helper.
Retry was kind of extracted from wait_until_reachable. The goal is to be
able to wait for a command to succeed, or fail if it doesn't succeed
after a defined number of attempts.

Indirectly improve the error logging: the output of the retry command
won't show up unless it constantly failed.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-04-30 20:09:54 -07:00
Andrea Luzzardi 85b4163f69 travis: Lint test files (ensure they are not space indented)
Fixed tab/spaces for existing integration tests.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-04-30 17:31:14 -07:00
Andrea Luzzardi b39e023e03 Merge pull request #673 from vieux/labels_storage
store constraints and affinities as labels
2015-04-30 14:36:23 -07:00
Victor Vieux f53b5df834 store constaints and affinities in labels
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-04-30 14:33:21 -07:00
Alexandre Beslic 5872d4c7b0 Merge pull request #688 from aluzzardi/fix-integration
fix integration test build of swarm
2015-04-30 14:32:34 -07:00
Sriram Natarajan 1b7d8ce5d3 Add Integration test for dependency filters
Signed-off-by: Sriram Natarajan <natarajan.sriram@gmail.com>
2015-04-30 20:37:53 +00:00
Andrea Luzzardi 29deacba2f fix integration test build of swarm
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-04-30 13:28:13 -07:00
Andrea Luzzardi 3e8d48f98e Merge pull request #655 from jimmyxian/add-cp-export-history-save-integration-test
Add cp/export/history/save integration test
2015-04-30 11:39:33 -07:00
Andrea Luzzardi e7cfa95b39 Merge pull request #637 from jimmyxian/add-commit-exec-rename-test
Add commit/exec integration test
2015-04-30 11:36:54 -07:00
Andrea Luzzardi b71d5fa19c Fix integration test cleanup.
- Do not run swarm using a function since it forks a subshell and we end
  up killing it instead of the binary.
- Build a binary at each run instead of using go run. This is faster and
  fixes the cleanup for the same reason as the subshell.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-04-28 15:47:25 -07:00
Victor Vieux 0924df6250 fix error message in tets
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-04-27 13:47:53 -07:00
Andrea Luzzardi 24396d8509 Merge pull request #669 from jimmyxian/improve-rename
improve rename
2015-04-27 12:39:48 -07:00
Andrea Luzzardi 30790fb1e3 Merge pull request #667 from vieux/affinity_labels
Affinity labels like  `-e affinity:com.example.type==test`
2015-04-27 12:36:07 -07:00
Andrea Luzzardi 9fd2a3ebc2 Merge pull request #679 from vieux/build
use godep go run everywhere in tests
2015-04-27 12:28:10 -07:00
Victor Vieux 622cd84f59 Merge pull request #666 from abronan/add_warning_integration_test
Add note against using devicemapper as a storage driver to run the integration tests
2015-04-27 11:53:49 -07:00
Victor Vieux c7746f9463 use godep go run everywhere in tests
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-04-27 10:45:45 -07:00
Victor Vieux 6028616892 fix syntax error in tests
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-04-27 10:37:39 -07:00
Victor Vieux a2dc4b87c5 added image affinity test and !=
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-04-27 10:05:38 -07:00
Xian Chaobo 3d2537eb84 move check into cluster and rename func
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-04-27 08:20:55 -04:00
Xian Chaobo b47e002e6c improve rename and update dockerclient
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-04-24 21:09:26 -04:00
Andrea Luzzardi d6011b4bc6 Merge pull request #609 from jimmyxian/add-support-imageload
Add support "docker load" api
2015-04-24 17:21:11 -07:00
Andrea Luzzardi 34196afc2d Merge pull request #654 from jimmyxian/add-images-pull-tag-integration-test
Add images/pull/tag integration test
2015-04-24 16:24:12 -07:00
Victor Vieux 28a358d9b2 use docker 1.6, add affinity tests and add doc
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-04-23 16:10:34 -07:00
Alexandre Beslic e016344d3f Add note against using devicemapper as a storage driver to run the integration tests
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-04-23 14:55:02 -07:00
Alexandre Beslic cf946d35f9 Merge pull request #652 from jimmyxian/add-pause-unpause-inspect-integration-test
Add pause/unpause/inspect integration test
2015-04-22 19:54:21 -07:00
Xian Chaobo 33dc4455eb bug fix
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-04-22 21:56:24 -04:00
Xian Chaobo 9ab51c796d add more notes
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-04-22 21:12:17 -04:00
Xian Chaobo e1abb65729 add images-pull-tag integration test
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-04-22 21:12:17 -04:00
Andrea Luzzardi 292be62cce Merge pull request #653 from jimmyxian/add-logs-run-rmi-rm-integration-test
Add logs/run/rmi/rm integration test
2015-04-22 14:28:05 -07:00
Andrea Luzzardi 48fc5024d3 Merge pull request #620 from jimmyxian/start-stop-restart-kill-integration-test
add create/start/stop/restart/kill integration test
2015-04-22 14:23:43 -07:00
Xian Chaobo a96f7508ec cp add checksum and bug fix
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-04-22 09:49:02 +08:00
Xian Chaobo 35ff088604 add commit exec integration test
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-04-22 08:59:12 +08:00
Andrea Luzzardi 7c4f866926 Merge pull request #636 from jimmyxian/add-attach-websocket-integration-test
Add attach-ws api integration test
2015-04-21 14:06:36 -07:00
Sriram Natarajan 9f29e95abc Add Node Labels to Cluster Info information
Updates: docker info output and /info API
Check for labels in API integration tests

Signed-off-by: Sriram Natarajan <natarajan.sriram@gmail.com>
2015-04-21 20:30:19 +00:00
Xian Chaobo c3112adb55 add unpause after pause and add inspect node verify
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-04-22 00:11:27 +08:00
Xian Chaobo ac3e6d677e bug fix
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-04-21 22:53:41 +08:00
Xian Chaobo 76c8c18bc9 pause fix
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-04-21 16:17:32 +08:00
Victor Vieux 279ce86c40 Merge pull request #642 from aluzzardi/cli-cleanup
Cleanup: Move CLI related files to a subpackage.
2015-04-20 12:00:47 -07:00
Xian Chaobo 33eedfa1d9 update api README.md and using tab instead of whitespace
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-04-20 03:02:50 -04:00
Xian Chaobo c4d5b76db7 enhance load integration test
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-04-19 23:11:29 -04:00
Andrea Luzzardi 86ed98baa2 integration: Run swarm using go run.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-04-18 20:26:55 -07:00
Xian Chaobo 65d397b0bb add logs-run-rmi-rm integration test
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-04-17 11:37:37 +08:00
Xian Chaobo 2ec8446344 remove FIXME
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-04-16 23:11:18 -04:00
Xian Chaobo 854b97c75c change the way to make temp file
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-04-17 11:05:55 +08:00
Xian Chaobo cb60e83615 format fix
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-04-17 10:22:03 +08:00