Fix tests for errors change

hashicorp · Feb 23, 2022 · 8699493 · 8699493
1 parent 254b4c4
commit 8699493
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/nomad/csi_endpoint_test.go b/nomad/csi_endpoint_test.go
@@ -323,8 +323,8 @@ func TestCSIVolumeEndpoint_Claim(t *testing.T) {
 	require.NoError(t, state.UpsertAllocs(structs.MsgTypeTestSetup, index, []*structs.Allocation{alloc2}))
 	claimReq.AllocationID = alloc2.ID
 	err = msgpackrpc.CallWithCodec(codec, "CSIVolume.Claim", claimReq, claimResp)
-	require.EqualError(t, err, "volume max claim reached",
-		"expected 'volume max claim reached' because we only allow 1 writer")
+	require.EqualError(t, err, structs.ErrCSIVolumeMaxClaims.Error(),
+		"expected 'volume max claims reached' because we only allow 1 writer")
 
 	// Fix the mode and our claim will succeed
 	claimReq.Claim = structs.CSIVolumeClaimRead

diff --git a/nomad/structs/csi_test.go b/nomad/structs/csi_test.go
@@ -57,7 +57,7 @@ func TestCSIVolumeClaim(t *testing.T) {
 	claim.AccessMode = CSIVolumeAccessModeMultiNodeSingleWriter
 	claim.Mode = CSIVolumeClaimWrite
 	claim.AllocationID = alloc2.ID
-	require.EqualError(t, vol.Claim(claim, alloc2), "unschedulable")
+	require.EqualError(t, vol.Claim(claim, alloc2), ErrCSIVolumeUnschedulable.Error())
 	require.True(t, vol.ReadSchedulable())
 	require.False(t, vol.WriteSchedulable())
 	require.False(t, vol.HasFreeWriteClaims())
@@ -138,7 +138,7 @@ func TestCSIVolumeClaim(t *testing.T) {
 	// store) and then ensure we cannot claim another write
 	vol.WriteAllocs[alloc2.ID] = alloc2
 	claim.Mode = CSIVolumeClaimWrite
-	require.EqualError(t, vol.Claim(claim, alloc3), "volume max claim reached")
+	require.EqualError(t, vol.Claim(claim, alloc3), ErrCSIVolumeMaxClaims.Error())
 
 	// release the write claim but ensure it doesn't free up write claims
 	// until after we've unpublished
@@ -235,7 +235,7 @@ func TestCSIVolumeClaim_CompatOldClaims(t *testing.T) {
 	// store) and then ensure we cannot claim another write
 	vol.WriteAllocs[alloc2.ID] = alloc2
 	claim.AllocationID = alloc3.ID
-	require.EqualError(t, vol.Claim(claim, alloc3), "volume max claim reached")
+	require.EqualError(t, vol.Claim(claim, alloc3), ErrCSIVolumeMaxClaims.Error())
 
 	// release the write claim but ensure it doesn't free up write claims
 	// until after we've unpublished
@@ -339,7 +339,7 @@ func TestCSIVolumeClaim_CompatNewClaimsOK(t *testing.T) {
 	// store) and then ensure we cannot claim another write
 	vol.WriteAllocs[alloc2.ID] = alloc2
 	claim.AllocationID = alloc3.ID
-	require.EqualError(t, vol.Claim(claim, alloc3), "volume max claim reached")
+	require.EqualError(t, vol.Claim(claim, alloc3), ErrCSIVolumeMaxClaims.Error())
 
 	// release the write claim but ensure it doesn't free up write claims
 	// until after we've unpublished
@@ -424,7 +424,7 @@ func TestCSIVolumeClaim_CompatNewClaimsNoUpgrade(t *testing.T) {
 	claim.AccessMode = CSIVolumeAccessModeMultiNodeSingleWriter
 	claim.Mode = CSIVolumeClaimWrite
 	claim.AllocationID = alloc2.ID
-	require.EqualError(t, vol.Claim(claim, alloc2), "unschedulable")
+	require.EqualError(t, vol.Claim(claim, alloc2), ErrCSIVolumeUnschedulable.Error())
 	require.True(t, vol.ReadSchedulable())
 	require.False(t, vol.WriteSchedulable())
 	require.False(t, vol.HasFreeWriteClaims())
@@ -459,7 +459,7 @@ func TestCSIVolumeClaim_CompatNewClaimsNoUpgrade(t *testing.T) {
 	claim.Mode = CSIVolumeClaimWrite
 	claim.State = CSIVolumeClaimStateTaken
 	claim.AllocationID = alloc2.ID
-	require.EqualError(t, vol.Claim(claim, alloc2), "unschedulable")
+	require.EqualError(t, vol.Claim(claim, alloc2), ErrCSIVolumeUnschedulable.Error())
 	require.Len(t, vol.ReadClaims, 0)
 	require.Len(t, vol.WriteClaims, 0)
 	require.Equal(t, CSIVolumeAccessModeUnknown, vol.AccessMode)