Skip to content

Commit

Permalink
Fix asserts in utmp tests (#49778)
Browse files Browse the repository at this point in the history
  • Loading branch information
atburke authored Dec 4, 2024
1 parent 9f5714f commit 5db4fcc
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions integration/utmp_integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -116,10 +116,10 @@ func TestRootUTMPEntryExists(t *testing.T) {
require.NoError(t, err)

require.EventuallyWithTf(t, func(collect *assert.CollectT) {
require.NoError(collect, uacc.UserWithPtyInDatabase(s.utmpPath, teleportTestUser))
require.NoError(collect, uacc.UserWithPtyInDatabase(s.wtmpPath, teleportTestUser))
assert.NoError(collect, uacc.UserWithPtyInDatabase(s.utmpPath, teleportTestUser))
assert.NoError(collect, uacc.UserWithPtyInDatabase(s.wtmpPath, teleportTestUser))
// Ensure than an entry was not written to btmp.
require.True(collect, trace.IsNotFound(uacc.UserWithPtyInDatabase(s.btmpPath, teleportTestUser)), "unexpected error: %v", err)
assert.True(collect, trace.IsNotFound(uacc.UserWithPtyInDatabase(s.btmpPath, teleportTestUser)), "unexpected error: %v", err)
}, 5*time.Minute, time.Second, "did not detect utmp entry within 5 minutes")
})

Expand Down Expand Up @@ -152,10 +152,10 @@ func TestRootUTMPEntryExists(t *testing.T) {
require.NoError(t, err)

require.EventuallyWithT(t, func(collect *assert.CollectT) {
require.NoError(collect, uacc.UserWithPtyInDatabase(s.btmpPath, teleportFakeUser))
assert.NoError(collect, uacc.UserWithPtyInDatabase(s.btmpPath, teleportFakeUser))
// Ensure that entries were not written to utmp and wtmp
require.True(collect, trace.IsNotFound(uacc.UserWithPtyInDatabase(s.utmpPath, teleportFakeUser)), "unexpected error: %v", err)
require.True(collect, trace.IsNotFound(uacc.UserWithPtyInDatabase(s.wtmpPath, teleportFakeUser)), "unexpected error: %v", err)
assert.True(collect, trace.IsNotFound(uacc.UserWithPtyInDatabase(s.utmpPath, teleportFakeUser)), "unexpected error: %v", err)
assert.True(collect, trace.IsNotFound(uacc.UserWithPtyInDatabase(s.wtmpPath, teleportFakeUser)), "unexpected error: %v", err)
}, 5*time.Minute, time.Second, "did not detect btmp entry within 5 minutes")
})

Expand Down

0 comments on commit 5db4fcc

Please sign in to comment.