kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-09 11:55:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix client-test, avoid hardwired platform dependecy on lo0

Browse Source
This commit is contained in:
Lang Martin
2019-03-28 08:57:57 -04:00
parent a7fed726c6
commit e89dbb2ab1
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client/client_test.go
View File

@@ -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},