Tonis Tiigi 703c536b96 Fix integration tests build errors ...

Caused by a merge conflict.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 4c7710d5d02acf42efa667fc33cb877385f2bbeb
Component: engine

2017-03-24 00:27:32 -07:00

..

checker

Remove pkg/integration and move it to testutil or integration-cli

2016-12-30 18:26:34 +01:00

cli

Introduce a cli package for test-integration

2017-03-23 18:35:22 +01:00

daemon

make secret update support name and id prefix

2017-03-07 16:01:21 +08:00

environment

Introduce a cli package for test-integration

2017-03-23 18:35:22 +01:00

fixtures

Convert script shebangs from "#!/bin/bash" to "#!/usr/bin/env bash"

2017-02-13 11:01:54 -08:00

registry

Revert "Planned 1.13 deprecation: email from login"

2017-03-15 10:43:18 -07:00

request

Update request.* signature to remove the host

2017-03-06 16:41:33 +01:00

requirement

Display only the name of the requirement…

2016-12-26 21:29:17 +01:00

benchmark_test.go

Remove pkg/integration and move it to testutil or integration-cli

2016-12-30 18:26:34 +01:00

check_test.go

Introduce a cli package for test-integration

2017-03-23 18:35:22 +01:00

daemon_swarm_hack_test.go

Small cleanups on integration cli

2017-01-12 16:57:59 +01:00

docker_api_attach_test.go

Add a new request package in integration-cli

2017-01-03 11:49:30 +01:00

docker_api_auth_test.go

Add a new request package in integration-cli

2017-01-03 11:49:30 +01:00

docker_api_build_test.go

Update request.* signature to remove the host

2017-03-06 16:41:33 +01:00

docker_api_containers_test.go

Introduce a cli package for test-integration

2017-03-23 18:35:22 +01:00

docker_api_create_test.go

validate healthcheck params in daemon side

2017-01-29 13:35:32 +08:00

docker_api_events_test.go

Update request.* signature to remove the host

2017-03-06 16:41:33 +01:00

docker_api_exec_resize_test.go

Update request.* signature to remove the host

2017-03-06 16:41:33 +01:00

docker_api_exec_test.go

Update request.* signature to remove the host

2017-03-06 16:41:33 +01:00

docker_api_images_test.go

Introduce a cli package for test-integration

2017-03-23 18:35:22 +01:00

docker_api_info_test.go

Add a new request package in integration-cli

2017-01-03 11:49:30 +01:00

docker_api_inspect_test.go

Use testEnv methods and remove most of the global variables

2017-01-17 12:39:08 +01:00

docker_api_inspect_unix_test.go

Add a new request package in integration-cli

2017-01-03 11:49:30 +01:00

docker_api_logs_test.go

Update request.* signature to remove the host

2017-03-06 16:41:33 +01:00

docker_api_network_test.go

Update request.* signature to remove the host

2017-03-06 16:41:33 +01:00

docker_api_resize_test.go

Add a new request package in integration-cli

2017-01-03 11:49:30 +01:00

docker_api_stats_test.go

Update request.* signature to remove the host

2017-03-06 16:41:33 +01:00

docker_api_stats_unix_test.go

Update request.* signature to remove the host

2017-03-06 16:41:33 +01:00

docker_api_swarm_node_test.go

split docker_api_swarm_test.go into multiple files

2017-02-11 00:18:01 +08:00

docker_api_swarm_secret_test.go

fixed:go vetting warning unkeyed fields

2017-03-20 16:30:01 +08:00

docker_api_swarm_service_test.go

Implement server-side rollback, for daemon versions that support this

2017-03-03 16:33:34 -08:00

docker_api_swarm_test.go

Merge pull request #31535 from aaronlehmann/vendor-swarmkit-7fc7503

2017-03-08 09:52:28 -08:00

docker_api_test.go

Update request.* signature to remove the host

2017-03-06 16:41:33 +01:00

docker_api_update_unix_test.go

Add a new request package in integration-cli

2017-01-03 11:49:30 +01:00

docker_api_version_test.go

Add a new request package in integration-cli

2017-01-03 11:49:30 +01:00

docker_api_volumes_test.go

Add a new request package in integration-cli

2017-01-03 11:49:30 +01:00

docker_cli_attach_test.go

Remove pkg/integration and move it to testutil or integration-cli

2016-12-30 18:26:34 +01:00

docker_cli_attach_unix_test.go

Remove pkg/integration and move it to testutil or integration-cli

2016-12-30 18:26:34 +01:00

docker_cli_authz_plugin_v2_test.go

When authz plugin is disabled, remove from authz middleware chain.

2017-03-22 12:07:39 -07:00

docker_cli_authz_unix_test.go

Use testEnv methods and remove most of the global variables

2017-01-17 12:39:08 +01:00

docker_cli_build_test.go

Fix integration tests build errors

2017-03-24 00:27:32 -07:00

docker_cli_build_unix_test.go

fix some ineffectual assignments

2017-01-24 11:16:19 +01:00

docker_cli_by_digest_test.go

Introduce a cli package for test-integration

2017-03-23 18:35:22 +01:00

docker_cli_commit_test.go

Introduce a cli package for test-integration

2017-03-23 18:35:22 +01:00

docker_cli_config_test.go

Update trustedCmd to be compatible with testutil/cmd

2017-01-09 11:07:05 +01:00

docker_cli_cp_from_container_test.go

Remove pkg/integration and move it to testutil or integration-cli

2016-12-30 18:26:34 +01:00

docker_cli_cp_test.go

Remove most of the runCommandWithOutput from integration tests

2017-01-30 10:54:06 +01:00

docker_cli_cp_to_container_test.go

fix some ineffectual assignments

2017-01-24 11:16:19 +01:00

docker_cli_cp_to_container_unix_test.go

Use testEnv methods and remove most of the global variables

2017-01-17 12:39:08 +01:00

docker_cli_cp_utils.go

Remove pkg/integration and move it to testutil or integration-cli

2016-12-30 18:26:34 +01:00

docker_cli_create_test.go

Introduce a cli package for test-integration

2017-03-23 18:35:22 +01:00

docker_cli_create_unix_test.go

validate mount path for tmpfs

2017-01-20 06:01:48 +00:00

docker_cli_daemon_plugins_test.go

Add missing test for daemon kill with plugins running.

2017-03-22 14:38:55 -07:00

docker_cli_daemon_test.go

Introduce a cli package for test-integration

2017-03-23 18:35:22 +01:00

docker_cli_diff_test.go

Use testEnv methods and remove most of the global variables

2017-01-17 12:39:08 +01:00

docker_cli_events_test.go

Introduce a cli package for test-integration

2017-03-23 18:35:22 +01:00

docker_cli_events_unix_test.go

Introduce a cli package for test-integration

2017-03-23 18:35:22 +01:00

docker_cli_exec_test.go

Introduce a cli package for test-integration

2017-03-23 18:35:22 +01:00

docker_cli_exec_unix_test.go

Remove pkg/integration and move it to testutil or integration-cli

2016-12-30 18:26:34 +01:00

docker_cli_experimental_test.go

Small cleanups on integration cli

2017-01-12 16:57:59 +01:00

docker_cli_export_import_test.go

Update trustedCmd to be compatible with testutil/cmd

2017-01-09 11:07:05 +01:00

docker_cli_external_graphdriver_unix_test.go

Use testEnv methods and remove most of the global variables

2017-01-17 12:39:08 +01:00

docker_cli_external_volume_driver_unix_test.go

Add unit tests to cli/command/volume package

2017-02-27 18:39:35 +01:00

docker_cli_health_test.go

Introduce a cli package for test-integration

2017-03-23 18:35:22 +01:00

docker_cli_help_test.go

Wrap output of docker cli --help

2017-02-03 11:05:49 +00:00

docker_cli_history_test.go

Introduce a cli package for test-integration

2017-03-23 18:35:22 +01:00

docker_cli_images_test.go

Introduce a cli package for test-integration

2017-03-23 18:35:22 +01:00

docker_cli_import_test.go

Remove pkg/integration and move it to testutil or integration-cli

2016-12-30 18:26:34 +01:00

docker_cli_info_test.go

Use testEnv methods and remove most of the global variables

2017-01-17 12:39:08 +01:00

docker_cli_info_unix_test.go

Remove pkg/integration and move it to testutil or integration-cli

2016-12-30 18:26:34 +01:00

docker_cli_inspect_test.go

do not fail fast when executing inspect command

2017-03-10 16:09:09 +08:00

docker_cli_kill_test.go

Add a new request package in integration-cli

2017-01-03 11:49:30 +01:00

docker_cli_links_test.go

Remove most of the runCommandWithOutput from integration tests

2017-01-30 10:54:06 +01:00

docker_cli_links_unix_test.go

Remove pkg/integration and move it to testutil or integration-cli

2016-12-30 18:26:34 +01:00

docker_cli_login_test.go

Revert "Planned 1.13 deprecation: email from login"

2017-03-15 10:43:18 -07:00

docker_cli_logout_test.go

Merge pull request #29799 from vdemeester/integration-registry-package

2017-01-02 15:37:09 +01:00

docker_cli_logs_bench_test.go

Fixes some issues with jsonfile write/read

2016-03-21 11:05:58 -04:00

docker_cli_logs_test.go

Clean more build utils in integration cli

2017-01-17 15:42:38 +01:00

docker_cli_nat_test.go

Introduce a cli package for test-integration

2017-03-23 18:35:22 +01:00

docker_cli_netmode_test.go

Remove pkg/integration and move it to testutil or integration-cli

2016-12-30 18:26:34 +01:00

docker_cli_network_unix_test.go

do not fail fast when executing inspect command

2017-03-10 16:09:09 +08:00

docker_cli_oom_killed_test.go

Remove pkg/integration and move it to testutil or integration-cli

2016-12-30 18:26:34 +01:00

docker_cli_pause_test.go

Remove most of the runCommandWithOutput from integration tests

2017-01-30 10:54:06 +01:00

docker_cli_plugins_test.go

Merge pull request #30047 from duglin/distError

2017-03-10 16:44:49 -08:00

docker_cli_port_test.go

Remove pkg/integration and move it to testutil or integration-cli

2016-12-30 18:26:34 +01:00

docker_cli_proxy_test.go

Update trustedCmd to be compatible with testutil/cmd

2017-01-09 11:07:05 +01:00

docker_cli_prune_unix_test.go

Add --filter until=<timestamp> for docker container/image prune

2017-01-04 14:16:42 -08:00

docker_cli_ps_test.go

Introduce a cli package for test-integration

2017-03-23 18:35:22 +01:00

docker_cli_pull_local_test.go

Introduce a cli package for test-integration

2017-03-23 18:35:22 +01:00

docker_cli_pull_test.go

Block Windows images on Linux

2017-02-02 11:07:30 -08:00

docker_cli_pull_trusted_test.go

Introduce a cli package for test-integration

2017-03-23 18:35:22 +01:00

docker_cli_push_test.go

Introduce a cli package for test-integration

2017-03-23 18:35:22 +01:00

docker_cli_registry_user_agent_test.go

Revert "Planned 1.13 deprecation: email from login"

2017-03-15 10:43:18 -07:00

docker_cli_rename_test.go

Use testEnv methods and remove most of the global variables

2017-01-17 12:39:08 +01:00

docker_cli_restart_test.go

Fix start/restart of detached container

2017-03-22 02:38:26 -07:00

docker_cli_rm_test.go

Introduce a cli package for test-integration

2017-03-23 18:35:22 +01:00

docker_cli_rmi_test.go

Introduce a cli package for test-integration

2017-03-23 18:35:22 +01:00

docker_cli_run_test.go

Introduce a cli package for test-integration

2017-03-23 18:35:22 +01:00

docker_cli_run_unix_test.go

Introduce a cli package for test-integration

2017-03-23 18:35:22 +01:00

docker_cli_save_load_test.go

Introduce a cli package for test-integration

2017-03-23 18:35:22 +01:00

docker_cli_save_load_unix_test.go

Introduce a cli package for test-integration

2017-03-23 18:35:22 +01:00

docker_cli_search_test.go

fix some ineffectual assignments

2017-01-24 11:16:19 +01:00

docker_cli_secret_create_test.go

fixed:go vetting warning unkeyed fields

2017-03-20 16:30:01 +08:00

docker_cli_secret_inspect_test.go

fixed:go vetting warning unkeyed fields

2017-03-20 16:30:01 +08:00

docker_cli_service_create_test.go

fixed:go vetting warning unkeyed fields

2017-03-20 16:30:01 +08:00

docker_cli_service_health_test.go

Small cleanups on integration cli

2017-01-12 16:57:59 +01:00

docker_cli_service_logs_experimental_test.go

Add tail and since to service logs

2017-03-10 14:59:00 -08:00

docker_cli_service_scale_test.go

Remove pkg/integration and move it to testutil or integration-cli

2016-12-30 18:26:34 +01:00

docker_cli_service_update_test.go

fixed:go vetting warning unkeyed fields

2017-03-20 16:30:01 +08:00

docker_cli_sni_test.go

Disable flakey TestClientSetsTLSServerName

2016-02-02 19:56:31 -08:00

docker_cli_stack_test.go

Add missing build tag for stack tests.

2017-02-01 13:25:37 -05:00

docker_cli_start_test.go

Remove pkg/integration and move it to testutil or integration-cli

2016-12-30 18:26:34 +01:00

docker_cli_stats_test.go

Send "Name" and "ID" when stating stopped containers

2017-02-09 09:46:59 +08:00

docker_cli_stop_test.go

Remove pkg/integration and move it to testutil or integration-cli

2016-12-30 18:26:34 +01:00

docker_cli_swarm_test.go

Introduce a cli package for test-integration

2017-03-23 18:35:22 +01:00

docker_cli_swarm_unix_test.go

skip plugin test on non x86 architectures

2017-03-07 09:28:10 -05:00

docker_cli_tag_test.go

Introduce a cli package for test-integration

2017-03-23 18:35:22 +01:00

docker_cli_top_test.go

Use testEnv methods and remove most of the global variables

2017-01-17 12:39:08 +01:00

docker_cli_update_test.go

Use testEnv methods and remove most of the global variables

2017-01-17 12:39:08 +01:00

docker_cli_update_unix_test.go

Update request.* signature to remove the host

2017-03-06 16:41:33 +01:00

docker_cli_userns_test.go

Remove pkg/integration and move it to testutil or integration-cli

2016-12-30 18:26:34 +01:00

docker_cli_v2_only_test.go

Fix leaked connections in integration tests

2017-01-11 14:48:48 -08:00

docker_cli_version_test.go

Remove pkg/integration and move it to testutil or integration-cli

2016-12-30 18:26:34 +01:00

docker_cli_volume_test.go

Introduce a cli package for test-integration

2017-03-23 18:35:22 +01:00

docker_cli_wait_test.go

Update trustedCmd to be compatible with testutil/cmd

2017-01-09 11:07:05 +01:00

docker_deprecated_api_v124_test.go

Update request.* signature to remove the host

2017-03-06 16:41:33 +01:00

docker_deprecated_api_v124_unix_test.go

Add a new request package in integration-cli

2017-01-03 11:49:30 +01:00

docker_experimental_network_test.go

Small cleanups on integration cli

2017-01-12 16:57:59 +01:00

docker_hub_pull_suite_test.go

Use testEnv methods and remove most of the global variables

2017-01-17 12:39:08 +01:00

docker_utils_test.go

Introduce a cli package for test-integration

2017-03-23 18:35:22 +01:00

events_utils_test.go

Remove pkg/integration and move it to testutil or integration-cli

2016-12-30 18:26:34 +01:00

fixtures_linux_daemon_test.go

Move TearDownTest cleaning to environment package

2017-03-01 21:04:11 +01:00

fixtures_test.go

Move TearDownTest cleaning to environment package

2017-03-01 21:04:11 +01:00

requirements_test.go

Use testEnv methods and remove most of the global variables

2017-01-17 12:39:08 +01:00

requirements_unix_test.go

Use testEnv methods and remove most of the global variables

2017-01-17 12:39:08 +01:00

test_vars_exec_test.go

Introduce a environment package in integration-cli

2016-12-29 11:00:50 +01:00

test_vars_noexec_test.go

Introduce a environment package in integration-cli

2016-12-29 11:00:50 +01:00

test_vars_noseccomp_test.go

Introduce a environment package in integration-cli

2016-12-29 11:00:50 +01:00

test_vars_seccomp_test.go

Introduce a environment package in integration-cli

2016-12-29 11:00:50 +01:00

test_vars_test.go

Use testEnv methods and remove most of the global variables

2017-01-17 12:39:08 +01:00

test_vars_unix_test.go

Introduce a environment package in integration-cli

2016-12-29 11:00:50 +01:00

test_vars_windows_test.go

Introduce a environment package in integration-cli

2016-12-29 11:00:50 +01:00

trust_server_test.go

Merge pull request #30151 from tonistiigi/fix-defunct

2017-01-16 08:55:16 +01:00

utils_test.go

Use testEnv methods and remove most of the global variables

2017-01-17 12:39:08 +01:00