Commit Graph

1467 Commits

Author SHA1 Message Date
Andrea Luzzardi b9cb4f4f35 integration: add debug to constraint
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-12 14:03:45 -07:00
Victor Vieux 38a1708e81 Merge pull request #754 from aluzzardi/jimmyxian-add-support-images-save
Add support images save
2015-05-11 17:16:36 -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
Andrea Luzzardi 9e2863ec71 api: getImages: changed error message
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-11 16:44:15 -07:00
Andrea Luzzardi 7403991cac API: Simplify getImages.
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
Andrea Luzzardi 7989a92161 Merge pull request #763 from snrism/etcd_discovery_test
etcd Integration test
2015-05-11 15:30:46 -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
Alexandre Beslic be62f36215 Merge pull request #757 from aluzzardi/integration-race-fixes
Integration race fixes
2015-05-08 19:02:35 -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
Andrea Luzzardi 4e118defc2 Merge pull request #733 from snrism/consul_integration_test
Integration test for consul discovery service
2015-05-08 14:21:09 -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
Andrea Luzzardi 833377929b Merge pull request #750 from jimmyxian/fix-run
Fix all api tests which do not need to use "run"
2015-05-08 13:31:52 -07: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
Andrea Luzzardi 0bd4b1faca Merge pull request #732 from vieux/fix_name_unique
fix name checks in create and rename
2015-05-07 16:24:16 -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
Andrea Luzzardi eeeba78a7f Merge pull request #746 from vieux/speedup_travis
do not check dco in travis
2015-05-07 16:16:54 -07:00
Victor Vieux a3a2fbe628 do not check dco in travis
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-05-07 16:13:56 -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 1bca3fb483 Merge pull request #744 from aluzzardi/ps-filters
container: Use state strings from dockerclient instead of embedding them
2015-05-07 15:50:17 -07:00
Andrea Luzzardi 5ee115fcd5 container: Use state strings from dockerclient instead of embedding
them.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-07 15:42:26 -07:00
Andrea Luzzardi 4f1c9597d8 godeps: Update dockerclient.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-07 15:42:26 -07:00
Alexandre Beslic 0317189ef2 Merge pull request #738 from aluzzardi/ps-filters
docker ps: Support for filters and improve state management.
2015-05-07 15:37:59 -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 8a00a5ff10 engine: Force full refresh when container changes state.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-06 23:38:32 -07:00
Andrea Luzzardi 4cf0a32e4d container: Add Status() and StateString() formatters.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-06 23:38:32 -07:00
Andrea Luzzardi c9199cef5a godep: update docker/docker/pkg
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-06 23:38:32 -07:00
Andrea Luzzardi 1a82c9ce7d godep: update dockerclient.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-06 22:52:30 -07:00
Andrea Luzzardi f49fc12ff3 Merge pull request #719 from aluzzardi/regression-tests
Regression tests
2015-05-06 16:13:01 -07:00
Andrea Luzzardi 0cc5d18e54 Merge pull request #730 from aluzzardi/integration-performance
Integration performance
2015-05-06 16:12:47 -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 cfd93a3ae7 Merge pull request #727 from aluzzardi/api-integration-split
integration: API tests split
2015-05-06 00:38:17 -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