From 102e0611475c7267dd4d2a87044fcc40b2eddcc0 Mon Sep 17 00:00:00 2001 From: Ahmet Alp Balkan Date: Fri, 20 Feb 2015 23:24:30 -0800 Subject: [PATCH] integration-cli: add test requirement ExecSupport Skip tests based on remote daemon's exec support (to exclude these tests from `make test` ran in LXC case). Makes use of `test_no_exec` build tag passed by build scripts. Signed-off-by: Ahmet Alp Balkan --- integration-cli/docker_cli_links_test.go | 4 ++-- integration-cli/requirements.go | 4 ++++ integration-cli/test_vars_exec.go | 8 ++++++++ integration-cli/test_vars_noexec.go | 8 ++++++++ 4 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 integration-cli/test_vars_exec.go create mode 100644 integration-cli/test_vars_noexec.go diff --git a/integration-cli/docker_cli_links_test.go b/integration-cli/docker_cli_links_test.go index a429902ee4..652db3280e 100644 --- a/integration-cli/docker_cli_links_test.go +++ b/integration-cli/docker_cli_links_test.go @@ -231,7 +231,7 @@ func TestLinksNotStartedParentNotFail(t *testing.T) { } func TestLinksHostsFilesInject(t *testing.T) { - testRequires(t, SameHostDaemon) + testRequires(t, SameHostDaemon, ExecSupport) defer deleteAllContainers() @@ -285,7 +285,7 @@ func TestLinksNetworkHostContainer(t *testing.T) { } func TestLinksUpdateOnRestart(t *testing.T) { - testRequires(t, SameHostDaemon) + testRequires(t, SameHostDaemon, ExecSupport) defer deleteAllContainers() diff --git a/integration-cli/requirements.go b/integration-cli/requirements.go index 783e982067..fe7c51ee74 100644 --- a/integration-cli/requirements.go +++ b/integration-cli/requirements.go @@ -21,6 +21,10 @@ var ( func() bool { return isUnixCli }, "Test requires posix utilities or functionality to run.", } + ExecSupport = TestRequirement{ + func() bool { return supportsExec }, + "Test requires 'docker exec' capabilities on the tested daemon.", + } ) // testRequires checks if the environment satisfies the requirements diff --git a/integration-cli/test_vars_exec.go b/integration-cli/test_vars_exec.go new file mode 100644 index 0000000000..7633b346ba --- /dev/null +++ b/integration-cli/test_vars_exec.go @@ -0,0 +1,8 @@ +// +build !test_no_exec + +package main + +const ( + // indicates docker daemon tested supports 'docker exec' + supportsExec = true +) diff --git a/integration-cli/test_vars_noexec.go b/integration-cli/test_vars_noexec.go new file mode 100644 index 0000000000..0845090524 --- /dev/null +++ b/integration-cli/test_vars_noexec.go @@ -0,0 +1,8 @@ +// +build test_no_exec + +package main + +const ( + // indicates docker daemon tested supports 'docker exec' + supportsExec = false +)