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
Xian Chaobo
59c5b6b317
use WaitGroup and move test in api.bats
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-04-16 22:10:39 -04:00
Xian Chaobo
293abe06f4
add pause/unpause/inspect integration test
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-04-17 09:56:24 +08:00
Xian Chaobo
820804b108
update load-image integration test
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-04-16 21:50:46 -04:00
Xian Chaobo
f200e9a954
rebase and update test
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-04-16 21:50:46 -04:00
Xian Chaobo
7da46216e0
integration test
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-04-16 21:50:46 -04:00
Andrea Luzzardi
b548683b32
integration: Fix docker build API test
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-04-16 18:41:30 -07:00
Xian Chaobo
58f14dae33
add cp/export/history/save integration test
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-04-17 09:02:20 +08:00
Xian Chaobo
fbd8ac5cc8
add attach-ws api integration test
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-04-17 08:05:42 +08:00
Xian Chaobo
5841d0f98e
add attach-diff-port-top integration test
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-04-17 06:11:52 +08:00
Xian Chaobo
7ac2948697
bug fix
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-04-17 05:03:27 +08:00
Xian Chaobo
6d5e9af343
enhance test
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-04-17 04:57:30 +08:00
Victor Vieux
05b01c7b43
forcerefresh after build and add test
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-04-16 12:22:09 -07:00
Victor Vieux
f94d78cecf
Merge pull request #628 from aluzzardi/api-integration-tests
...
integration: Add skeleton for missing integration tests.
2015-04-16 12:08:25 -07:00
Xian Chaobo
fc692741d7
add attach-diff-port-pull-top integration test
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-04-16 23:44:50 +08:00
Xian Chaobo
805b826161
add create-start-stop-restart-kill integration test
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-04-16 22:43:08 +08:00
Andrea Luzzardi
62afd8133a
integration: Fix swarm_manage helper with custom discovery.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-04-15 19:39:12 -07:00
Andrea Luzzardi
05802bba5a
integration: Add skeleton for missing integration tests.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-04-15 18:16:07 -07:00
Andrea Luzzardi
7c62291d47
Merge pull request #581 from chanwit/test-file-discovery
...
integration: test for file discovery
2015-04-13 12:07:40 -07:00
Chanwit Kaewkasi
20dd07354d
add the integration test for file discovery
...
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
2015-04-11 07:55:04 +07:00
Andrea Luzzardi
6947d27e18
api integration tests: Indent with tabs rather than spaces
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-04-10 11:33:06 -07:00
Andrea Luzzardi
258492faa7
Fix integration tests for swarm_manage changes
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-04-10 11:31:15 -07:00
Andrea Luzzardi
b250a3a5cf
Merge pull request #582 from chanwit/test-zk-discovery
...
integration: test for ZooKeeper discovery
2015-04-09 20:11:30 -07:00
Chanwit Kaewkasi
6102c1d357
add port filter for the host mode
...
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
2015-04-10 00:32:10 +07:00
Chanwit Kaewkasi
e9cd9ba234
add integration test for zookeeper discovery
...
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
2015-04-10 00:05:08 +07:00
Chanwit Kaewkasi
b1803bc7e5
regression for 0.2.0
...
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
2015-04-06 14:04:15 +07:00
Victor Vieux
f3d64cfad3
unskip and fix a few tests
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-04-03 00:48:07 +00:00
Chanwit Kaewkasi
458d83802f
make SWARM_ROOT configurable
...
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
2015-03-26 22:51:09 +07:00
Nick Huanca, Matt Bajor, Matt Knox, Fed Sawyer, Joseph Benavidez, Tom Haschenburger and Wes Morgan
366d234626
Closes #501 : Error if unknown args are used in create
...
Signed-off-by: Matt Bajor <matt@notevenremotelydorky.com>
2015-03-26 02:39:33 +00:00
Victor Vieux
7945e0a482
Merge pull request #468 from vieux/ps_n_l
...
add support for docker ps -l / -n
2015-03-10 16:42:58 -07:00
Victor Vieux
33471d72d3
Merge pull request #459 from aluzzardi/integration-readme
...
integration: Add README file.
2015-03-10 11:50:29 -07:00
Victor Vieux
328b9ae13b
add support for docker ps -l / -n
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-03-10 01:04:27 +00:00
Andrea Luzzardi
64eeb7e3c9
integration: Fix API # nodes check.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-03-09 15:32:14 -07:00
Andrea Luzzardi
1e2cc75c22
integration: Add README file.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-03-06 18:36:33 -08:00
Andrea Luzzardi
21c7d423e4
integration: Add constraints integration tests.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-03-06 17:39:36 -08:00
Andrea Luzzardi
f9a6c1bd89
integration: stop_docker: delete volumes as well.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-03-06 17:20:26 -08:00
Andrea Luzzardi
9567185038
integration helpers: Fix concurrent calls to start_docker().
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-03-06 16:09:06 -08:00
Andrea Luzzardi
ac7fdeab6b
integration: Minor bash improvements in the helpers.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-03-06 16:09:06 -08:00
Andrea Luzzardi
8fb3d303db
integration: Add simple API test to demonstrate the helpers.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-03-06 11:42:43 -08:00
Andrea Luzzardi
108f4ebe06
integration: Rename vars to helpers.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-03-06 11:42:43 -08:00
Andrea Luzzardi
b023b78e7b
integration tests: Add helpers to start/stop the manager and engines.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-03-06 11:42:43 -08:00
Andrea Luzzardi
d0b10516d6
integration: Remove manage-non-available-node test.
...
It makes integration tests run really slow.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-03-03 17:39:55 -08:00
Andrea Luzzardi
7dc04ee694
integration: Do not verify git hash since it's set to HEAD in master.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-03-03 17:35:07 -08:00
Andrea Luzzardi
998cc63f78
bats: Convert encoding to utf-8 unix.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-03-03 17:34:42 -08:00
Andrea Luzzardi
fa22dbf6a6
Integration tests: Deterministic swarm binary path resolution
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-03-03 17:30:07 -08:00
Chanwit Kaewkasi
046f26f1b8
add Bats integration tests
...
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
2015-03-04 03:13:30 +07:00