Andrea Luzzardi
b9cb4f4f35
integration: add debug to constraint
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-12 14:03:45 -07:00
Andrea Luzzardi
d88105dbfe
integration: minor cleanup of docker save multi-images
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-11 16:44:15 -07:00
Xian Chaobo
42af0fadd7
fix var name and integration test
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-05-11 16:44:15 -07:00
Xian Chaobo
3962f6ffdf
add-support-images-save
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-05-11 16:44:15 -07:00
Victor Vieux
5b3a03b852
Merge pull request #759 from aluzzardi/integration-race-fixes
...
integration: Fix API races related to delay in refresh.
2015-05-11 16:09:46 -07:00
Andrea Luzzardi
abc5e4ebf1
Merge pull request #758 from chanwit/wait-for-zk-started
...
integration: wait for zookeeper to start
2015-05-11 15:44:59 -07:00
Sriram Natarajan
e9f773f10f
Etcd Integration test
...
Signed-off-by: Sriram Natarajan <natarajan.sriram@gmail.com>
2015-05-11 21:53:16 +00:00
Andrea Luzzardi
fdd3513cbf
integration: check status with ps filter rather than inspect.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-09 16:33:57 -07:00
Andrea Luzzardi
a0973e6f91
integration: Fix pause test and make sure the cleanup is done properly.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-08 19:52:49 -07:00
Andrea Luzzardi
4bb035e41a
integration: Fix API races related to delay in refresh.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-08 19:26:58 -07:00
Chanwit Kaewkasi
d0320d78a6
integration: wait for zookeeper to start
...
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
2015-05-09 08:44:48 +07:00
Andrea Luzzardi
edb3504bc4
integration: affinities: add debug to help fix the test.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-08 18:23:52 -07:00
Andrea Luzzardi
c8f0fa545a
integration: events: Fix race condition in tests.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-08 18:22:55 -07:00
Sriram Natarajan
63492feb3f
Integration test for consul discovery service
...
Signed-off-by: Sriram Natarajan <natarajan.sriram@gmail.com>
2015-05-08 21:11:31 +00:00
Xian Chaobo
b986c151c5
fix all api tests which do not need to use run
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-05-07 22:07:34 -04:00
Andrea Luzzardi
f50dedee66
Merge pull request #747 from vieux/fix_flacky_rm_test
...
fix flacky rm test
2015-05-07 17:30:58 -07:00
Victor Vieux
aeb83be5df
fix flacky rm test
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-05-07 16:21:43 -07:00
Victor Vieux
056f7150ab
add test
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-05-07 16:08:50 -07:00
Victor Vieux
a74d00d1c5
fix name checks
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-05-07 15:50:34 -07:00
Andrea Luzzardi
0556ad6d54
integration: ps --filter: wait for exited to containers to actual exit.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-07 01:32:49 -07:00
Andrea Luzzardi
64ae9eef9b
integration: add some debug to ps
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-07 01:25:03 -07:00
Andrea Luzzardi
c69f0db71f
docker ps: Support for filters and improve state management.
...
- `docker ps` now fully supports `--filter` flags
- Generate `Status` in `docker ps` dynamically. "Up X seconds" is now
real-time.
- Misc cleanup.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-06 23:38:32 -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
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