From b87daf6d697655ca092bf54717a64b07504a13c1 Mon Sep 17 00:00:00 2001 From: Peter Bourgon Date: Wed, 30 Jul 2014 15:35:42 +0200 Subject: [PATCH] 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) --- daemon/graphdriver/graphtest/{graphtest.go => graph_test.go} | 0 pkg/mount/{mountinfo_test_linux.go => mountinfo_linux_test.go} | 2 ++ pkg/testutils/{testutils.go => utils_test.go} | 0 3 files changed, 2 insertions(+) rename daemon/graphdriver/graphtest/{graphtest.go => graph_test.go} (100%) rename pkg/mount/{mountinfo_test_linux.go => mountinfo_linux_test.go} (99%) rename pkg/testutils/{testutils.go => utils_test.go} (100%) diff --git a/daemon/graphdriver/graphtest/graphtest.go b/daemon/graphdriver/graphtest/graph_test.go similarity index 100% rename from daemon/graphdriver/graphtest/graphtest.go rename to daemon/graphdriver/graphtest/graph_test.go diff --git a/pkg/mount/mountinfo_test_linux.go b/pkg/mount/mountinfo_linux_test.go similarity index 99% rename from pkg/mount/mountinfo_test_linux.go rename to pkg/mount/mountinfo_linux_test.go index f2e3daa8b3..07ef7e0225 100644 --- a/pkg/mount/mountinfo_test_linux.go +++ b/pkg/mount/mountinfo_linux_test.go @@ -1,3 +1,5 @@ +// +build linux + package mount import ( diff --git a/pkg/testutils/testutils.go b/pkg/testutils/utils_test.go similarity index 100% rename from pkg/testutils/testutils.go rename to pkg/testutils/utils_test.go