Fix lint and existing test

gravitational · Mar 6, 2024 · 14faaba · 14faaba
1 parent feb4d7f
commit 14faaba
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/api/types/access_request_test.go b/api/types/access_request_test.go
@@ -20,10 +20,11 @@ import (
 	"testing"
 	"time"
 
-	"github.com/gravitational/teleport/api/constants"
 	"github.com/gravitational/trace"
 	"github.com/jonboulle/clockwork"
 	"github.com/stretchr/testify/require"
+
+	"github.com/gravitational/teleport/api/constants"
 )
 
 func TestAssertAccessRequestImplementsResourceWithLabels(t *testing.T) {

diff --git a/lib/auth/access_request_test.go b/lib/auth/access_request_test.go
@@ -1631,7 +1631,7 @@ func TestAccessRequest_AssumeStartTime(t *testing.T) {
 		err = testPack.tlsServer.Auth().SetAccessRequestState(ctx, update)
 		require.NoError(t, err)
 
-		// double check accesss request was updated.
+		// double check access request was updated.
 		resp, err = testPack.tlsServer.AuthServer.AuthServer.GetAccessRequests(ctx, types.AccessRequestFilter{})
 		require.NoError(t, err)
 		require.Len(t, resp, 1)

diff --git a/lib/services/access_request_test.go b/lib/services/access_request_test.go
@@ -644,7 +644,7 @@ func TestReviewThresholds(t *testing.T) {
 					propose:         approve,
 					assumeStartTime: clock.Now().UTC().Add(10000 * time.Hour),
 					errCheck: func(tt require.TestingT, err error, i ...interface{}) {
-						require.ErrorIs(tt, err, trace.BadParameter("request start time is after expiry"), i...)
+						require.Contains(tt, err.Error(), "assume start time cannot equal or exceed access expiry time", i...)
 					},
 				},
 			},
@@ -703,7 +703,7 @@ func TestReviewThresholds(t *testing.T) {
 				author, ok := userStates[rt.author]
 				require.True(t, ok, "scenario=%q, rev=%d", tt.desc, ri)
 
-				err = ApplyAccessReview(req, rev, author)
+				err = ApplyAccessReview(req, rev, author, clock)
 				if rt.errCheck != nil {
 					rt.errCheck(t, err)
 					continue