ITQC/containernetworking-plugins
24
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 34 Wiki Activity

Ensure /run/cni exists in the filesystem before running dhcp tests

Browse Source
This commit is contained in:
Michael Cambria
2018-10-08 14:08:37 -04:00
parent 3de323f3f0
commit 3d349e4645
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/ipam/dhcp/dhcp_test.go
View File

@ -41,7 +41,7 @@ import (
) )
func getTmpDir() (string, error) { func getTmpDir() (string, error) {
tmpDir, err := ioutil.TempDir("/run/cni", "dhcp") tmpDir, err := ioutil.TempDir(tmpPrefix, "dhcp")
if err == nil { if err == nil {
tmpDir = filepath.ToSlash(tmpDir) tmpDir = filepath.ToSlash(tmpDir)
} }
@ -108,6 +108,7 @@ const (
hostVethName string = "dhcp0" hostVethName string = "dhcp0"
contVethName string = "eth0" contVethName string = "eth0"
pidfilePath string = "/var/run/cni/dhcp-client.pid" pidfilePath string = "/var/run/cni/dhcp-client.pid"
tmpPrefix = "/run/cni"
) )
var socketPath string var socketPath string
@ -117,12 +118,13 @@ var err error
var _ = BeforeSuite(func() { var _ = BeforeSuite(func() {
os.Remove(socketPath) os.Remove(socketPath)
os.Remove(pidfilePath) os.Remove(pidfilePath)
err := os.MkdirAll(tmpPrefix, 0700)
Expect(err).NotTo(HaveOccurred())
}) })
var _ = AfterSuite(func() { var _ = AfterSuite(func() {
os.Remove(socketPath) os.Remove(socketPath)
os.Remove(pidfilePath) os.Remove(pidfilePath)
defer os.RemoveAll(tmpDir)
}) })
var _ = Describe("DHCP Operations", func() { var _ = Describe("DHCP Operations", func() {
@ -229,6 +231,7 @@ var _ = Describe("DHCP Operations", func() {
Expect(targetNS.Close()).To(Succeed()) Expect(targetNS.Close()).To(Succeed())
os.Remove(socketPath) os.Remove(socketPath)
os.Remove(pidfilePath) os.Remove(pidfilePath)
defer os.RemoveAll(tmpDir)
}) })
It("configures and deconfigures a link with ADD/DEL", func() { It("configures and deconfigures a link with ADD/DEL", func() {