Remove unused pidfilePath const

Moved global var's to BeforeEach()
This commit is contained in:
Michael Cambria 2018-10-09 16:39:06 -04:00
parent ef913eadd5
commit 73106f0ece

View File

@ -107,14 +107,9 @@ func dhcpServerStart(netns ns.NetNS, leaseIP, serverIP net.IP, stopCh <-chan boo
const ( const (
hostVethName string = "dhcp0" hostVethName string = "dhcp0"
contVethName string = "eth0" contVethName string = "eth0"
pidfilePath string = "/var/run/cni/dhcp-client.pid"
cniDirPrefix string = "/var/run/cni" cniDirPrefix string = "/var/run/cni"
) )
var socketPath string
var tmpDir string
var err error
var _ = BeforeSuite(func() { var _ = BeforeSuite(func() {
err := os.MkdirAll(cniDirPrefix, 0700) err := os.MkdirAll(cniDirPrefix, 0700)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
@ -125,6 +120,9 @@ var _ = Describe("DHCP Operations", func() {
var dhcpServerStopCh chan bool var dhcpServerStopCh chan bool
var dhcpServerDone *sync.WaitGroup var dhcpServerDone *sync.WaitGroup
var clientCmd *exec.Cmd var clientCmd *exec.Cmd
var socketPath string
var tmpDir string
var err error
BeforeEach(func() { BeforeEach(func() {
dhcpServerStopCh = make(chan bool) dhcpServerStopCh = make(chan bool)