From ac50624393dc935baeda345d8a3070ae08b458cb Mon Sep 17 00:00:00 2001 From: Evan Hazlett Date: Thu, 2 Mar 2017 15:37:43 -0500 Subject: [PATCH] fix unrelated failing tests Signed-off-by: Evan Hazlett --- plugins/ipam/host-local/host_local_test.go | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/plugins/ipam/host-local/host_local_test.go b/plugins/ipam/host-local/host_local_test.go index e6b690fa..87aa141e 100644 --- a/plugins/ipam/host-local/host_local_test.go +++ b/plugins/ipam/host-local/host_local_test.go @@ -109,6 +109,9 @@ var _ = Describe("host-local Operations", func() { Expect(err).NotTo(HaveOccurred()) defer os.RemoveAll(tmpDir) + err = ioutil.WriteFile(filepath.Join(tmpDir, "resolv.conf"), []byte("nameserver 192.0.2.3"), 0644) + Expect(err).NotTo(HaveOccurred()) + conf := fmt.Sprintf(`{ "cniVersion": "0.1.0", "name": "mynet", @@ -117,9 +120,10 @@ var _ = Describe("host-local Operations", func() { "ipam": { "type": "host-local", "subnet": "10.1.2.0/24", - "dataDir": "%s" + "dataDir": "%s", + "resolvConf": "%s/resolv.conf" } -}`, tmpDir) +}`, tmpDir, tmpDir) args := &skel.CmdArgs{ ContainerID: "dummy", @@ -175,7 +179,7 @@ var _ = Describe("host-local Operations", func() { defer os.RemoveAll(tmpDir) conf := fmt.Sprintf(`{ - "cniVersion": "0.2.0", + "cniVersion": "0.3.0", "name": "mynet", "type": "ipvlan", "master": "foo0",