Skip to content

Commit b5b452a

Browse files
Merge pull request #3169 from jerichokeyne/ocm-21584
OCM-21584 | test: Improve id:72899 expiration date check
2 parents 0d00bf9 + 24bd33f commit b5b452a

1 file changed

Lines changed: 3 additions & 4 deletions

File tree

tests/e2e/hcp_external_auth_test.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,9 @@ var _ = Describe("External auth provider", labels.Feature.ExternalAuthProvider,
8282
By("Create a break-glass-credential to the cluster")
8383
resp, err = rosaClient.BreakGlassCredential.CreateBreakGlassCredential(clusterID, value...)
8484
createTime := time.Now().UTC()
85-
expiredTime := createTime.Add(15 * time.Minute).Format("Jan _2 2006 15:04 MST")
85+
expiredTime := createTime.Add(15 * time.Minute)
8686
if key == "emptyExpiration" || key == "empty" {
87-
expiredTime = createTime.Add(24 * time.Hour).Format("Jan _2 2006 15:04 MST")
87+
expiredTime = createTime.Add(24 * time.Hour)
8888
}
8989
Expect(err).ToNot(HaveOccurred())
9090
textData := rosaClient.Parser.TextData.Input(resp).Parse().Tip()
@@ -118,11 +118,10 @@ var _ = Describe("External auth provider", labels.Feature.ExternalAuthProvider,
118118
By("Describe the break-glass-credential")
119119
output, err := rosaClient.BreakGlassCredential.DescribeBreakGlassCredentialsAndReflect(clusterID, breakGlassCredID)
120120
Expect(err).ToNot(HaveOccurred())
121-
// expiration timestamp changes from 4 to 5 seconds ahead, so have to remove second from time stamp
122121
expirationTime, err := time.Parse("Jan _2 2006 15:04:05 MST", output.ExpireAt)
123122
Expect(err).ToNot(HaveOccurred())
124123
Expect(output.ID).To(Equal(breakGlassCredID))
125-
Expect(expirationTime.Format("Jan _2 2006 15:04 MST")).To(Equal(expiredTime))
124+
Expect(expirationTime).To(BeTemporally("~", expiredTime, time.Minute))
126125
Expect(output.Username).To(Equal(userName))
127126
Expect(output.Status).To(Equal("issued"))
128127

0 commit comments

Comments
 (0)