From b75c55fd7264ea39dce55518495ec2d38a81fe33 Mon Sep 17 00:00:00 2001 From: Peter Bourgon Date: Wed, 30 Jul 2014 15:35:42 +0200 Subject: [PATCH 1/2] Only import "testing" from *_test.go This prevents the testing package flags from leaking into the flagsets of binaries that import docker. I left integration-cli alone. Docker-DCO-1.1-Signed-off-by: Peter Bourgon (github: peterbourgon) Upstream-commit: b87daf6d697655ca092bf54717a64b07504a13c1 Component: engine --- .../graphdriver/graphtest/{graphtest.go => graph_test.go} | 0 .../mount/{mountinfo_test_linux.go => mountinfo_linux_test.go} | 2 ++ components/engine/pkg/testutils/{testutils.go => utils_test.go} | 0 3 files changed, 2 insertions(+) rename components/engine/daemon/graphdriver/graphtest/{graphtest.go => graph_test.go} (100%) rename components/engine/pkg/mount/{mountinfo_test_linux.go => mountinfo_linux_test.go} (99%) rename components/engine/pkg/testutils/{testutils.go => utils_test.go} (100%) diff --git a/components/engine/daemon/graphdriver/graphtest/graphtest.go b/components/engine/daemon/graphdriver/graphtest/graph_test.go similarity index 100% rename from components/engine/daemon/graphdriver/graphtest/graphtest.go rename to components/engine/daemon/graphdriver/graphtest/graph_test.go diff --git a/components/engine/pkg/mount/mountinfo_test_linux.go b/components/engine/pkg/mount/mountinfo_linux_test.go similarity index 99% rename from components/engine/pkg/mount/mountinfo_test_linux.go rename to components/engine/pkg/mount/mountinfo_linux_test.go index f2e3daa8b3..07ef7e0225 100644 --- a/components/engine/pkg/mount/mountinfo_test_linux.go +++ b/components/engine/pkg/mount/mountinfo_linux_test.go @@ -1,3 +1,5 @@ +// +build linux + package mount import ( diff --git a/components/engine/pkg/testutils/testutils.go b/components/engine/pkg/testutils/utils_test.go similarity index 100% rename from components/engine/pkg/testutils/testutils.go rename to components/engine/pkg/testutils/utils_test.go From 22832ff041936d64ac4e0d02dbc8b5753fc27d14 Mon Sep 17 00:00:00 2001 From: Michael Crosby Date: Thu, 7 Aug 2014 14:24:37 -0700 Subject: [PATCH 2/2] Graphtest is ok to compile normally The graphtest package is only imported in the test files of other packages therefore we do not leak testing flags. Signed-off-by: Michael Crosby Upstream-commit: b386bce1f1bc92584282cc3f6656878c05d75272 Component: engine --- .../daemon/graphdriver/graphtest/{graph_test.go => graphtest.go} | 0 components/engine/pkg/testutils/{utils_test.go => utils.go} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename components/engine/daemon/graphdriver/graphtest/{graph_test.go => graphtest.go} (100%) rename components/engine/pkg/testutils/{utils_test.go => utils.go} (100%) diff --git a/components/engine/daemon/graphdriver/graphtest/graph_test.go b/components/engine/daemon/graphdriver/graphtest/graphtest.go similarity index 100% rename from components/engine/daemon/graphdriver/graphtest/graph_test.go rename to components/engine/daemon/graphdriver/graphtest/graphtest.go diff --git a/components/engine/pkg/testutils/utils_test.go b/components/engine/pkg/testutils/utils.go similarity index 100% rename from components/engine/pkg/testutils/utils_test.go rename to components/engine/pkg/testutils/utils.go