Skip to content

[v11] Change TestDeleteMFADeviceSync to do per-delete assertions#26409

Merged
codingllama merged 2 commits intobranch/v11from
codingllama/backport/26311-v11
May 17, 2023
Merged

[v11] Change TestDeleteMFADeviceSync to do per-delete assertions#26409
codingllama merged 2 commits intobranch/v11from
codingllama/backport/26311-v11

Conversation

@codingllama
Copy link
Copy Markdown
Contributor

Backport #26311 to branch/v11

Change TestDeleteMFADeviceSync to assert inside the t.Run loop and remove
trailing assertions.

#26190

* Change TestDeleteMFADeviceSync to do per-delete assertions

* nit: Change minDevices to `1` for readability
Comment thread lib/auth/auth_test.go

username := "llama@goteleport.com"
_, _, err := CreateUserAndRole(srv.Auth(), username, []string{username})
_, _, err := CreateUserAndRole(authServer, username, []string{username})
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Conflict was in this line, same as branch/v12: CreateUserAndRole has an extra argument on master/branch/v13.

@codingllama codingllama added this pull request to the merge queue May 17, 2023
Merged via the queue into branch/v11 with commit ba51d90 May 17, 2023
@codingllama codingllama deleted the codingllama/backport/26311-v11 branch May 17, 2023 14:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants