From f22bf1b3da2c818110a7f794f86e79c90ad1443e Mon Sep 17 00:00:00 2001 From: "Jonathan Leibiusky @xetorthio" Date: Fri, 17 Nov 2017 09:23:29 -0300 Subject: [PATCH] Fix failing tests --- scheduler/task/check_swarm_ports_test.go | 2 +- scheduler/task/check_swarm_status_test.go | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scheduler/task/check_swarm_ports_test.go b/scheduler/task/check_swarm_ports_test.go index 23cedd8..ca871f2 100644 --- a/scheduler/task/check_swarm_ports_test.go +++ b/scheduler/task/check_swarm_ports_test.go @@ -44,7 +44,7 @@ func TestCheckSwarmPorts_RunWhenManager(t *testing.T) { f.On("GetForInstance", i).Return(d, nil) d.On("GetDaemonInfo").Return(info, nil) d.On("GetSwarmPorts").Return([]string{"aaaabbbb_node1", "aaaabbbb_node2"}, []uint16{8080, 9090}, nil) - e.M.On("Emit", CheckSwarmPortsEvent, "aaaabbbbcccc", []interface{}{DockerSwarmPorts{Manager: i.Name, Instances: []string{i.Name, "aaaabbbb_node2"}, Ports: []int{8080, 9090}}}).Return() + e.M.On("Emit", CheckSwarmPortsEvent, "aaaabbbbcccc", []interface{}{ClusterPorts{Manager: i.Name, Instances: []string{i.Name, "aaaabbbb_node2"}, Ports: []int{8080, 9090}}}).Return() task := NewCheckSwarmPorts(e, f) ctx := context.Background() diff --git a/scheduler/task/check_swarm_status_test.go b/scheduler/task/check_swarm_status_test.go index 0e1ba3c..5077a0e 100644 --- a/scheduler/task/check_swarm_status_test.go +++ b/scheduler/task/check_swarm_status_test.go @@ -41,7 +41,7 @@ func TestCheckSwarmStatus_RunWhenInactive(t *testing.T) { f.On("GetForInstance", i).Return(d, nil) d.On("GetDaemonInfo").Return(infoInactive, nil) - e.M.On("Emit", CheckSwarmStatusEvent, "aaabbbccc", []interface{}{DockerSwarmStatus{IsManager: false, IsWorker: false, Instance: "node1"}}).Return() + e.M.On("Emit", CheckSwarmStatusEvent, "aaabbbccc", []interface{}{ClusterStatus{IsManager: false, IsWorker: false, Instance: "node1"}}).Return() task := NewCheckSwarmStatus(e, f) ctx := context.Background() @@ -72,7 +72,7 @@ func TestCheckSwarmStatus_RunWhenLocked(t *testing.T) { f.On("GetForInstance", i).Return(d, nil) d.On("GetDaemonInfo").Return(infoLocked, nil) - e.M.On("Emit", CheckSwarmStatusEvent, "aaabbbccc", []interface{}{DockerSwarmStatus{IsManager: false, IsWorker: false, Instance: "node1"}}).Return() + e.M.On("Emit", CheckSwarmStatusEvent, "aaabbbccc", []interface{}{ClusterStatus{IsManager: false, IsWorker: false, Instance: "node1"}}).Return() task := NewCheckSwarmStatus(e, f) ctx := context.Background() @@ -104,7 +104,7 @@ func TestCheckSwarmStatus_RunWhenManager(t *testing.T) { f.On("GetForInstance", i).Return(d, nil) d.On("GetDaemonInfo").Return(infoLocked, nil) - e.M.On("Emit", CheckSwarmStatusEvent, "aaabbbccc", []interface{}{DockerSwarmStatus{IsManager: true, IsWorker: false, Instance: "node1"}}).Return() + e.M.On("Emit", CheckSwarmStatusEvent, "aaabbbccc", []interface{}{ClusterStatus{IsManager: true, IsWorker: false, Instance: "node1"}}).Return() task := NewCheckSwarmStatus(e, f) ctx := context.Background() @@ -136,7 +136,7 @@ func TestCheckSwarmStatus_RunWhenWorker(t *testing.T) { f.On("GetForInstance", i).Return(d, nil) d.On("GetDaemonInfo").Return(infoLocked, nil) - e.M.On("Emit", CheckSwarmStatusEvent, "aaabbbccc", []interface{}{DockerSwarmStatus{IsManager: false, IsWorker: true, Instance: "node1"}}).Return() + e.M.On("Emit", CheckSwarmStatusEvent, "aaabbbccc", []interface{}{ClusterStatus{IsManager: false, IsWorker: true, Instance: "node1"}}).Return() task := NewCheckSwarmStatus(e, f) ctx := context.Background()