From 73106f0ece9a8b08393b112bbd20ca6d65e72a13 Mon Sep 17 00:00:00 2001 From: Michael Cambria Date: Tue, 9 Oct 2018 16:39:06 -0400 Subject: [PATCH] Remove unused pidfilePath const Moved global var's to BeforeEach() --- plugins/ipam/dhcp/dhcp_test.go | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/plugins/ipam/dhcp/dhcp_test.go b/plugins/ipam/dhcp/dhcp_test.go index fc2e15b7..b865c18f 100644 --- a/plugins/ipam/dhcp/dhcp_test.go +++ b/plugins/ipam/dhcp/dhcp_test.go @@ -107,14 +107,9 @@ func dhcpServerStart(netns ns.NetNS, leaseIP, serverIP net.IP, stopCh <-chan boo const ( hostVethName string = "dhcp0" contVethName string = "eth0" - pidfilePath string = "/var/run/cni/dhcp-client.pid" cniDirPrefix string = "/var/run/cni" ) -var socketPath string -var tmpDir string -var err error - var _ = BeforeSuite(func() { err := os.MkdirAll(cniDirPrefix, 0700) Expect(err).NotTo(HaveOccurred()) @@ -125,6 +120,9 @@ var _ = Describe("DHCP Operations", func() { var dhcpServerStopCh chan bool var dhcpServerDone *sync.WaitGroup var clientCmd *exec.Cmd + var socketPath string + var tmpDir string + var err error BeforeEach(func() { dhcpServerStopCh = make(chan bool)