luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Revert "local state: fix test with updated error message" 

This reverts commit e9149f64d9afb38246f9432edd806321c1eefb83.
This commit is contained in:
Frank Schroeder 2017-10-23 10:08:34 +02:00
parent ded6f79b6a
commit 80d9df69e4
No known key found for this signature in database
GPG Key ID: 4D65C6EAEC87DECD
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
agent/local/state.go
View File

@ -348,7 +348,7 @@ func (l *State) AddCheck(check *structs.HealthCheck, token string) error {
// if there is a serviceID associated with the check, make sure it exists before adding it
// NOTE - This logic may be moved to be handled within the Agent's Addcheck method after a refactor
if check.ServiceID != "" && l.services[check.ServiceID] == nil {
return fmt.Errorf("Check %q refers to non-existent service %q", check.CheckID, check.ServiceID)
return fmt.Errorf("Check %q refers to non-existent service %q does not exist", check.CheckID, check.ServiceID)
}
// hard-set the node name

8
agent/local/state_test.go
View File

@ -1,7 +1,6 @@
package local_test
import (
"errors"
"fmt"
"reflect"
"testing"
@ -1454,10 +1453,11 @@ func TestAgent_AddCheckFailure(t *testing.T) {
ServiceID: "redis",
Status: api.HealthPassing,
}
wantErr := errors.New(`Check "redis:1" refers to non-existent service "redis"`)
if got, want := l.AddCheck(chk, ""), wantErr; !reflect.DeepEqual(got, want) {
t.Fatalf("got error %q want %q", got, want)
expectedErr := "ServiceID \"redis\" does not exist"
if err := l.AddCheck(chk, ""); err == nil || expectedErr != err.Error() {
t.Fatalf("Expected error when adding a check for a non-existent service but got %v", err)
}
}
func TestAgent_sendCoordinate(t *testing.T) {