From 1adbe641600552ad025aafb5b3bcd487a9f90d7d Mon Sep 17 00:00:00 2001 From: Jeff Mitchell Date: Mon, 21 Sep 2020 15:08:15 -0400 Subject: [PATCH] Update some tests that are failing due to 300 nano difference in time comparisons between create and lookup (#393) --- .../handlers/sessions/session_service_test.go | 16 ++++++++++++++++ internal/session/repository_session_test.go | 4 ++++ 2 files changed, 20 insertions(+) diff --git a/internal/servers/controller/handlers/sessions/session_service_test.go b/internal/servers/controller/handlers/sessions/session_service_test.go index 5c6cd92ad8..a9480cd3c4 100644 --- a/internal/servers/controller/handlers/sessions/session_service_test.go +++ b/internal/servers/controller/handlers/sessions/session_service_test.go @@ -2,6 +2,7 @@ package sessions_test import ( "testing" + "time" "github.com/google/go-cmp/cmp" "github.com/hashicorp/boundary/internal/auth" @@ -120,6 +121,10 @@ func TestGetSession(t *testing.T) { got, gErr := s.GetSession(auth.DisabledAuthTestContext(auth.WithScopeId(tc.scopeId)), tc.req) assert.Equal(tc.errCode, status.Code(gErr), "GetSession(%+v) got error %v, wanted %v", tc.req, gErr, tc.errCode) + if tc.res != nil { + assert.True(got.GetItem().GetExpirationTime().AsTime().Sub(tc.res.GetItem().GetExpirationTime().AsTime()) < 10*time.Millisecond) + tc.res.GetItem().ExpirationTime = got.GetItem().GetExpirationTime() + } assert.Empty(cmp.Diff(got, tc.res, protocmp.Transform()), "GetSession(%q) got response\n%q, wanted\n%q", tc.req, got, tc.res) }) } @@ -212,6 +217,12 @@ func TestList(t *testing.T) { got, gErr := s.ListSessions(auth.DisabledAuthTestContext(auth.WithScopeId(tc.req.GetScopeId())), tc.req) assert.Equal(t, tc.errCode, status.Code(gErr), "ListSessions(%+v) got error %v, wanted %v", tc.req, gErr, tc.errCode) + if tc.res != nil { + for i, wantSess := range tc.res.GetItems() { + assert.True(t, got.GetItems()[i].GetExpirationTime().AsTime().Sub(wantSess.GetExpirationTime().AsTime()) < 10*time.Millisecond) + wantSess.ExpirationTime = got.GetItems()[i].GetExpirationTime() + } + } assert.Empty(t, cmp.Diff(got, tc.res, protocmp.Transform()), "ListSessions(%q) got response %q, wanted %q", tc.req, got, tc.res) }) } @@ -358,6 +369,11 @@ func TestCancel(t *testing.T) { got.GetItem().States = nil got.GetItem().UpdatedTime = nil + if tc.res != nil { + assert.True(got.GetItem().GetExpirationTime().AsTime().Sub(tc.res.GetItem().GetExpirationTime().AsTime()) < 10*time.Millisecond) + tc.res.GetItem().ExpirationTime = got.GetItem().GetExpirationTime() + } + assert.Empty(cmp.Diff(got, tc.res, protocmp.Transform()), "GetSession(%q) got response\n%q, wanted\n%q", tc.req, got, tc.res) if tc.req != nil { diff --git a/internal/session/repository_session_test.go b/internal/session/repository_session_test.go index 2c938c8aca..a4acbf7e76 100644 --- a/internal/session/repository_session_test.go +++ b/internal/session/repository_session_test.go @@ -484,6 +484,10 @@ func TestRepository_AuthorizeConnect(t *testing.T) { require.NotNil(c) require.NotNil(cs) assert.Equal(StatusAuthorized, cs[0].Status) + + assert.True(authzInfo.ExpirationTime.GetTimestamp().AsTime().Sub(tt.wantAuthzInfo.ExpirationTime.GetTimestamp().AsTime()) < 10*time.Millisecond) + tt.wantAuthzInfo.ExpirationTime = authzInfo.ExpirationTime + assert.Equal(tt.wantAuthzInfo.ExpirationTime, authzInfo.ExpirationTime) assert.Equal(tt.wantAuthzInfo.ConnectionLimit, authzInfo.ConnectionLimit) assert.Equal(tt.wantAuthzInfo.CurrentConnectionCount, authzInfo.CurrentConnectionCount)