Fix tests

m3db · Nov 18, 2020 · 8d8f08f · 8d8f08f
1 parent 5b5d75a
commit 8d8f08f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/src/cluster/placement/placement.go b/src/cluster/placement/placement.go
@@ -385,8 +385,8 @@ func validate(p Placement) error {
 						instancesLeavingShardsWithMatchingInitShards[sourceID] = matches
 					}
 
-					match := matches[s.ID()]
-					if match != "" {
+					match, ok := matches[s.ID()]
+					if ok {
 						return fmt.Errorf(
 							"instance %s has initializing shard %d with "+
 								"source ID %s but leaving instance has shard already matched by %s",

diff --git a/src/cluster/placement/placement_test.go b/src/cluster/placement/placement_test.go
@@ -140,7 +140,7 @@ func TestMismatchShards(t *testing.T) {
 
 	// mismatch shards
 	p := NewPlacement().SetInstances([]Instance{i1, i2}).SetShards([]uint32{1, 2, 3}).SetReplicaFactor(1)
-	assert.Error(t, Validate(p))
+	require.Error(t, Validate(p))
 }
 
 func TestNonSharded(t *testing.T) {
@@ -156,8 +156,8 @@ func TestNonSharded(t *testing.T) {
 func TestValidateMirrorButNotSharded(t *testing.T) {
 	p := NewPlacement().SetIsMirrored(true)
 	err := Validate(p)
-	assert.Error(t, err)
-	assert.Equal(t, errMirrorNotSharded, err)
+	require.Error(t, err)
+	assert.Equal(t, errMirrorNotSharded.Error(), err.Error())
 }
 
 func TestValidateMissingShard(t *testing.T) {
@@ -171,7 +171,7 @@ func TestValidateMissingShard(t *testing.T) {
 	ids := []uint32{1, 2}
 	p := NewPlacement().SetInstances([]Instance{i1, i2}).SetShards(ids).SetReplicaFactor(2).SetIsSharded(true)
 	err := Validate(p)
-	assert.Error(t, err)
+	require.Error(t, err)
 	assert.Equal(t, "invalid placement, the total available shards in the placement is 3, expecting 4", err.Error())
 }
 
@@ -190,8 +190,9 @@ func TestValidateUnexpectedShard(t *testing.T) {
 		SetReplicaFactor(2).
 		SetIsSharded(true)
 
-	assert.Error(t, Validate(p))
-	assert.Equal(t, errUnexpectedShards, Validate(p))
+	err := Validate(p)
+	require.Error(t, err)
+	assert.Equal(t, errUnexpectedShards.Error(), err.Error())
 }
 
 func TestValidateDuplicatedShards(t *testing.T) {
@@ -209,8 +210,9 @@ func TestValidateDuplicatedShards(t *testing.T) {
 		SetInstances([]Instance{i1, i2}).
 		SetShards([]uint32{2, 3, 4, 4, 5, 6}).
 		SetReplicaFactor(1)
-	assert.Error(t, Validate(p))
-	assert.Equal(t, errDuplicatedShards, Validate(p))
+	err := Validate(p)
+	require.Error(t, err)
+	assert.Equal(t, errDuplicatedShards.Error(), err.Error())
 }
 
 func TestValidateWrongReplicaForSomeShards(t *testing.T) {