From e89dbb2ab182b6368507dbcd33c3342223eb0ae7 Mon Sep 17 00:00:00 2001 From: Lang Martin Date: Thu, 28 Mar 2019 08:57:57 -0400 Subject: [PATCH] fix client-test, avoid hardwired platform dependecy on lo0 --- client/client_test.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/client/client_test.go b/client/client_test.go index 528c51079..1517810c1 100644 --- a/client/client_test.go +++ b/client/client_test.go @@ -1249,6 +1249,7 @@ func TestClient_UpdateNodeFromFingerprintKeepsConfig(t *testing.T) { // Client without network configured updates to match fingerprint client, cleanup := TestClient(t, nil) defer cleanup() + dev := client.config.Node.NodeResources.Networks[0].Device client.updateNodeFromFingerprint(&fingerprint.FingerprintResponse{ NodeResources: &structs.NodeResources{ Cpu: structs.NodeCpuResources{CpuShares: 123}, @@ -1267,19 +1268,16 @@ func TestClient_UpdateNodeFromFingerprintKeepsConfig(t *testing.T) { assert.Equal(t, "any-interface", client.config.Node.Resources.Networks[0].Device) // Client with network configured keeps the config setting on update - dev := "lo0" name := "TestClient_UpdateNodeFromFingerprintKeepsConfig2" client, cleanup = TestClient(t, func(c *config.Config) { c.NetworkInterface = dev - // Node is already a mock.Node, with a hardwired "eth0" device c.Node.Name = name + // Node is already a mock.Node, with a device c.Node.NodeResources.Networks[0].Device = dev c.Node.Resources.Networks = c.Node.NodeResources.Networks }) // REVIEW: are both defers going to run? should I just use different names? defer cleanup() - assert.Equal(t, dev, client.config.NetworkInterface) - assert.Equal(t, dev, client.config.Node.NodeResources.Networks[0].Device) client.updateNodeFromFingerprint(&fingerprint.FingerprintResponse{ NodeResources: &structs.NodeResources{ Cpu: structs.NodeCpuResources{CpuShares: 123},