Ahmet Alp Balkan 4cac2d34df integration-cli: remove timeout dependency on TestEventsUntag ...

TestEventsUntag requires a `timeout` command which does not
exist on OS X or Windows (in fact, windows has a totally different
timeout program and this test was accidentally using it).

- Created runCommandWithOutputForDuration.
  This entirely replaces runDockerCommandWithTimeout and
  removes dependency to `timeout` command.
- Made runDockerCommandWithTimeout reuse runDockerCommandForDuration.

TestEventsUntag works now on Windows.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: 5dbaea1ca99ecb51174259f5ebb814101c349edc
Component: engine

2015-02-14 02:17:42 -08:00

components/engine

integration-cli: remove timeout dependency on TestEventsUntag

2015-02-14 02:17:42 -08:00

S

Description

The Docker CLI

clidocker

361 MiB

Languages

Go 92.3%

Shell 5.4%

Dockerfile 1.1%

Go-Checksums 0.7%

Makefile 0.3%

Other 0.2%