Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[azadmin] change frequency of poller in tests #23475

Merged
merged 3 commits into from
Sep 25, 2024
Merged

[azadmin] change frequency of poller in tests #23475

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7bcc251
change frequency
gracewilcox Sep 20, 2024
fbe61b7
charles feedback
gracewilcox Sep 20, 2024
35e902d
add comment
gracewilcox Sep 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 40 additions & 7 deletions sdk/security/keyvault/azadmin/backup/client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
"testing"
"time"

"github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime"
"github.com/Azure/azure-sdk-for-go/sdk/azcore/to"
"github.com/Azure/azure-sdk-for-go/sdk/internal/recording"
"github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azadmin/backup"
Expand All @@ -21,13 +22,21 @@ import (

func TestBackupRestore(t *testing.T) {
client, sasToken := startBackupTest(t)

testSerde(t, &sasToken)

// if in live mode, wait 30 seconds before polling again
gracewilcox marked this conversation as resolved.
Show resolved Hide resolved
// in playback mode, we don't need that delay, so shortening the retry frequency
var frequency time.Duration
if recording.GetRecordMode() == recording.PlaybackMode {
frequency = time.Second
}

// backup the vault
backupPoller, err := client.BeginFullBackup(context.Background(), sasToken, nil)
require.NoError(t, err)
backupResults, err := backupPoller.PollUntilDone(context.Background(), nil)
backupResults, err := backupPoller.PollUntilDone(context.Background(), &runtime.PollUntilDoneOptions{
Frequency: frequency,
})
require.NoError(t, err)
require.Nil(t, backupResults.Error)
require.Equal(t, "Succeeded", *backupResults.Status)
Expand All @@ -44,7 +53,9 @@ func TestBackupRestore(t *testing.T) {
testSerde(t, &restoreOperationParameters)
restorePoller, err := client.BeginFullRestore(context.Background(), restoreOperationParameters, nil)
require.NoError(t, err)
restoreResults, err := restorePoller.PollUntilDone(context.Background(), nil)
restoreResults, err := restorePoller.PollUntilDone(context.Background(), &runtime.PollUntilDoneOptions{
Frequency: frequency,
})
require.NoError(t, err)
require.Nil(t, restoreResults.Error)
require.Equal(t, "Succeeded", *restoreResults.Status)
Expand All @@ -62,6 +73,13 @@ func TestBackupRestore(t *testing.T) {
func TestBackupRestoreWithResumeToken(t *testing.T) {
client, sasToken := startBackupTest(t)

// if in live mode, wait 30 seconds before polling again
// in playback mode, we don't need that delay, so shortening the retry frequency
var frequency time.Duration
if recording.GetRecordMode() == recording.PlaybackMode {
frequency = time.Second
}

// backup the vault
backupPoller, err := client.BeginFullBackup(context.Background(), sasToken, nil)
require.NoError(t, err)
Expand All @@ -71,7 +89,9 @@ func TestBackupRestoreWithResumeToken(t *testing.T) {
require.NoError(t, err)
newBackupPoller, err := client.BeginFullBackup(context.Background(), sasToken, &backup.BeginFullBackupOptions{ResumeToken: token})
require.NoError(t, err)
backupResults, err := newBackupPoller.PollUntilDone(context.Background(), nil)
backupResults, err := newBackupPoller.PollUntilDone(context.Background(), &runtime.PollUntilDoneOptions{
Frequency: frequency,
})
require.NoError(t, err)
require.Nil(t, backupResults.Error)
require.Equal(t, "Succeeded", *backupResults.Status)
Expand All @@ -94,7 +114,9 @@ func TestBackupRestoreWithResumeToken(t *testing.T) {
require.NoError(t, err)
newRestorePoller, err := client.BeginFullRestore(context.Background(), restoreOperationParameters, &backup.BeginFullRestoreOptions{ResumeToken: restoreToken})
require.NoError(t, err)
restoreResults, err := newRestorePoller.PollUntilDone(context.Background(), nil)
restoreResults, err := newRestorePoller.PollUntilDone(context.Background(), &runtime.PollUntilDoneOptions{
Frequency: frequency,
})
require.NoError(t, err)
require.Nil(t, restoreResults.Error)
require.Equal(t, "Succeeded", *restoreResults.Status)
Expand All @@ -112,6 +134,13 @@ func TestBackupRestoreWithResumeToken(t *testing.T) {
func TestBeginSelectiveKeyRestoreOperation(t *testing.T) {
backupClient, sasToken := startBackupTest(t)

// if in live mode, wait 30 seconds before polling again
// in playback mode, we don't need that delay, so shortening the retry frequency
var frequency time.Duration
if recording.GetRecordMode() == recording.PlaybackMode {
frequency = time.Second
}

// create a key to selectively restore
if recording.GetRecordMode() != recording.PlaybackMode {
cred := credential
Expand All @@ -128,7 +157,9 @@ func TestBeginSelectiveKeyRestoreOperation(t *testing.T) {
// backup the vault
backupPoller, err := backupClient.BeginFullBackup(context.Background(), sasToken, nil)
require.NoError(t, err)
backupResults, err := backupPoller.PollUntilDone(context.Background(), nil)
backupResults, err := backupPoller.PollUntilDone(context.Background(), &runtime.PollUntilDoneOptions{
Frequency: frequency,
})
require.NoError(t, err)

// restore the key
Expand All @@ -141,7 +172,9 @@ func TestBeginSelectiveKeyRestoreOperation(t *testing.T) {
testSerde(t, &restoreOperationParameters)
selectivePoller, err := backupClient.BeginSelectiveKeyRestore(context.Background(), "selective-restore-test-key", restoreOperationParameters, nil)
require.NoError(t, err)
selectiveResults, err := selectivePoller.PollUntilDone(context.Background(), nil)
selectiveResults, err := selectivePoller.PollUntilDone(context.Background(), &runtime.PollUntilDoneOptions{
Frequency: frequency,
})
require.NoError(t, err)
testSerde(t, &selectiveResults)

Expand Down