fix tests

gravitational · Nov 4, 2024 · b4e12e5 · b4e12e5
1 parent c79c465
commit b4e12e5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/lib/services/local/autoupdate_test.go b/lib/services/local/autoupdate_test.go
@@ -93,8 +93,11 @@ func TestAutoUpdateServiceConfigCRUD(t *testing.T) {
 	var notFoundError *trace.NotFoundError
 	require.ErrorAs(t, err, &notFoundError)
 
+	// If we try to conditionally update a missing resource, we receive
+	// a CompareFailed instead of a NotFound.
+	var revisionMismatchError *trace.CompareFailedError
 	_, err = service.UpdateAutoUpdateConfig(ctx, config)
-	require.ErrorAs(t, err, &notFoundError)
+	require.ErrorAs(t, err, &revisionMismatchError)
 }
 
 // TestAutoUpdateServiceVersionCRUD verifies get/create/update/upsert/delete methods of the backend service
@@ -155,8 +158,11 @@ func TestAutoUpdateServiceVersionCRUD(t *testing.T) {
 	var notFoundError *trace.NotFoundError
 	require.ErrorAs(t, err, &notFoundError)
 
+	// If we try to conditionally update a missing resource, we receive
+	// a CompareFailed instead of a NotFound.
+	var revisionMismatchError *trace.CompareFailedError
 	_, err = service.UpdateAutoUpdateVersion(ctx, version)
-	require.ErrorAs(t, err, &notFoundError)
+	require.ErrorAs(t, err, &revisionMismatchError)
 }
 
 // TestAutoUpdateServiceInvalidNameCreate verifies that configuration and version

diff --git a/tool/tctl/common/edit_command_test.go b/tool/tctl/common/edit_command_test.go
@@ -574,7 +574,7 @@ func testEditAutoUpdateConfig(t *testing.T, clt *authclient.Client) {
 	require.NoError(t, err)
 
 	serviceClient := autoupdatev1pb.NewAutoUpdateServiceClient(clt.GetConnection())
-	_, err = serviceClient.CreateAutoUpdateConfig(ctx, &autoupdatev1pb.CreateAutoUpdateConfigRequest{Config: initial})
+	initial, err = serviceClient.CreateAutoUpdateConfig(ctx, &autoupdatev1pb.CreateAutoUpdateConfigRequest{Config: initial})
 	require.NoError(t, err, "creating initial autoupdate config")
 
 	editor := func(name string) error {
@@ -616,7 +616,7 @@ func testEditAutoUpdateVersion(t *testing.T, clt *authclient.Client) {
 	require.NoError(t, err)
 
 	serviceClient := autoupdatev1pb.NewAutoUpdateServiceClient(clt.GetConnection())
-	_, err = serviceClient.CreateAutoUpdateVersion(ctx, &autoupdatev1pb.CreateAutoUpdateVersionRequest{Version: initial})
+	initial, err = serviceClient.CreateAutoUpdateVersion(ctx, &autoupdatev1pb.CreateAutoUpdateVersionRequest{Version: initial})
 	require.NoError(t, err, "creating initial autoupdate version")
 
 	editor := func(name string) error {