Skip to content

Backport of Fix retry loops that use t into release/1.2.x #2313

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

Merged
hc-github-team-consul-core merged 1 commit into from
Jun 8, 2023
Merged

Backport of Fix retry loops that use t into release/1.2.x #2313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion acceptance/tests/cli/cli_install_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ func TestInstall(t *testing.T) {
retry.RunWith(retrier, t, func(r *retry.R) {
for podName := range list {
out, err := cli.Run(t, ctx.KubectlOptions(t), "proxy", "read", podName)
require.NoError(t, err)
require.NoError(r, err)

output := string(out)
logger.Log(t, output)
Expand Down
58 changes: 29 additions & 29 deletions acceptance/tests/config-entries/config_entries_namespaces_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,35 +242,35 @@ func TestControllerNamespaces(t *testing.T) {
require.NoError(r, err)
rateLimitIPConfigEntry, ok := entry.(*api.RateLimitIPConfigEntry)
require.True(r, ok, "could not cast to RateLimitIPConfigEntry")
require.Equal(t, "permissive", rateLimitIPConfigEntry.Mode)
require.Equal(t, 100.0, rateLimitIPConfigEntry.ReadRate)
require.Equal(t, 100.0, rateLimitIPConfigEntry.WriteRate)
require.Equal(t, 100.0, rateLimitIPConfigEntry.ACL.ReadRate)
require.Equal(t, 100.0, rateLimitIPConfigEntry.ACL.WriteRate)
require.Equal(t, 100.0, rateLimitIPConfigEntry.Catalog.ReadRate)
require.Equal(t, 100.0, rateLimitIPConfigEntry.Catalog.WriteRate)
require.Equal(t, 100.0, rateLimitIPConfigEntry.ConfigEntry.ReadRate)
require.Equal(t, 100.0, rateLimitIPConfigEntry.ConfigEntry.WriteRate)
require.Equal(t, 100.0, rateLimitIPConfigEntry.ConnectCA.ReadRate)
require.Equal(t, 100.0, rateLimitIPConfigEntry.ConnectCA.WriteRate)
require.Equal(t, 100.0, rateLimitIPConfigEntry.Coordinate.ReadRate)
require.Equal(t, 100.0, rateLimitIPConfigEntry.Coordinate.WriteRate)
require.Equal(t, 100.0, rateLimitIPConfigEntry.DiscoveryChain.ReadRate)
require.Equal(t, 100.0, rateLimitIPConfigEntry.DiscoveryChain.WriteRate)
require.Equal(t, 100.0, rateLimitIPConfigEntry.Health.ReadRate)
require.Equal(t, 100.0, rateLimitIPConfigEntry.Health.WriteRate)
require.Equal(t, 100.0, rateLimitIPConfigEntry.Intention.ReadRate)
require.Equal(t, 100.0, rateLimitIPConfigEntry.Intention.WriteRate)
require.Equal(t, 100.0, rateLimitIPConfigEntry.KV.ReadRate)
require.Equal(t, 100.0, rateLimitIPConfigEntry.KV.WriteRate)
require.Equal(t, 100.0, rateLimitIPConfigEntry.Tenancy.ReadRate)
require.Equal(t, 100.0, rateLimitIPConfigEntry.Tenancy.WriteRate)
//require.Equal(t, 100.0, rateLimitIPConfigEntry.PreparedQuery.ReadRate)
//require.Equal(t, 100.0, rateLimitIPConfigEntry.PreparedQuery.WriteRate)
require.Equal(t, 100.0, rateLimitIPConfigEntry.Session.ReadRate)
require.Equal(t, 100.0, rateLimitIPConfigEntry.Session.WriteRate)
require.Equal(t, 100.0, rateLimitIPConfigEntry.Txn.ReadRate)
require.Equal(t, 100.0, rateLimitIPConfigEntry.Txn.WriteRate)
require.Equal(r, "permissive", rateLimitIPConfigEntry.Mode)
require.Equal(r, 100.0, rateLimitIPConfigEntry.ReadRate)
require.Equal(r, 100.0, rateLimitIPConfigEntry.WriteRate)
require.Equal(r, 100.0, rateLimitIPConfigEntry.ACL.ReadRate)
require.Equal(r, 100.0, rateLimitIPConfigEntry.ACL.WriteRate)
require.Equal(r, 100.0, rateLimitIPConfigEntry.Catalog.ReadRate)
require.Equal(r, 100.0, rateLimitIPConfigEntry.Catalog.WriteRate)
require.Equal(r, 100.0, rateLimitIPConfigEntry.ConfigEntry.ReadRate)
require.Equal(r, 100.0, rateLimitIPConfigEntry.ConfigEntry.WriteRate)
require.Equal(r, 100.0, rateLimitIPConfigEntry.ConnectCA.ReadRate)
require.Equal(r, 100.0, rateLimitIPConfigEntry.ConnectCA.WriteRate)
require.Equal(r, 100.0, rateLimitIPConfigEntry.Coordinate.ReadRate)
require.Equal(r, 100.0, rateLimitIPConfigEntry.Coordinate.WriteRate)
require.Equal(r, 100.0, rateLimitIPConfigEntry.DiscoveryChain.ReadRate)
require.Equal(r, 100.0, rateLimitIPConfigEntry.DiscoveryChain.WriteRate)
require.Equal(r, 100.0, rateLimitIPConfigEntry.Health.ReadRate)
require.Equal(r, 100.0, rateLimitIPConfigEntry.Health.WriteRate)
require.Equal(r, 100.0, rateLimitIPConfigEntry.Intention.ReadRate)
require.Equal(r, 100.0, rateLimitIPConfigEntry.Intention.WriteRate)
require.Equal(r, 100.0, rateLimitIPConfigEntry.KV.ReadRate)
require.Equal(r, 100.0, rateLimitIPConfigEntry.KV.WriteRate)
require.Equal(r, 100.0, rateLimitIPConfigEntry.Tenancy.ReadRate)
require.Equal(r, 100.0, rateLimitIPConfigEntry.Tenancy.WriteRate)
//require.Equal(r, 100.0, rateLimitIPConfigEntry.PreparedQuery.ReadRate)
//require.Equal(r, 100.0, rateLimitIPConfigEntry.PreparedQuery.WriteRate)
require.Equal(r, 100.0, rateLimitIPConfigEntry.Session.ReadRate)
require.Equal(r, 100.0, rateLimitIPConfigEntry.Session.WriteRate)
require.Equal(r, 100.0, rateLimitIPConfigEntry.Txn.ReadRate)
require.Equal(r, 100.0, rateLimitIPConfigEntry.Txn.WriteRate)
})
}

Expand Down
58 changes: 29 additions & 29 deletions acceptance/tests/config-entries/config_entries_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,35 +209,35 @@ func TestController(t *testing.T) {
require.NoError(r, err)
rateLimitIPConfigEntry, ok := entry.(*api.RateLimitIPConfigEntry)
require.True(r, ok, "could not cast to RateLimitIPConfigEntry")
require.Equal(t, "permissive", rateLimitIPConfigEntry.Mode)
require.Equal(t, 100.0, rateLimitIPConfigEntry.ReadRate)
require.Equal(t, 100.0, rateLimitIPConfigEntry.WriteRate)
require.Equal(t, 100.0, rateLimitIPConfigEntry.ACL.ReadRate)
require.Equal(t, 100.0, rateLimitIPConfigEntry.ACL.WriteRate)
require.Equal(t, 100.0, rateLimitIPConfigEntry.Catalog.ReadRate)
require.Equal(t, 100.0, rateLimitIPConfigEntry.Catalog.WriteRate)
require.Equal(t, 100.0, rateLimitIPConfigEntry.ConfigEntry.ReadRate)
require.Equal(t, 100.0, rateLimitIPConfigEntry.ConfigEntry.WriteRate)
require.Equal(t, 100.0, rateLimitIPConfigEntry.ConnectCA.ReadRate)
require.Equal(t, 100.0, rateLimitIPConfigEntry.ConnectCA.WriteRate)
require.Equal(t, 100.0, rateLimitIPConfigEntry.Coordinate.ReadRate)
require.Equal(t, 100.0, rateLimitIPConfigEntry.Coordinate.WriteRate)
require.Equal(t, 100.0, rateLimitIPConfigEntry.DiscoveryChain.ReadRate)
require.Equal(t, 100.0, rateLimitIPConfigEntry.DiscoveryChain.WriteRate)
require.Equal(t, 100.0, rateLimitIPConfigEntry.Health.ReadRate)
require.Equal(t, 100.0, rateLimitIPConfigEntry.Health.WriteRate)
require.Equal(t, 100.0, rateLimitIPConfigEntry.Intention.ReadRate)
require.Equal(t, 100.0, rateLimitIPConfigEntry.Intention.WriteRate)
require.Equal(t, 100.0, rateLimitIPConfigEntry.KV.ReadRate)
require.Equal(t, 100.0, rateLimitIPConfigEntry.KV.WriteRate)
require.Equal(t, 100.0, rateLimitIPConfigEntry.Tenancy.ReadRate)
require.Equal(t, 100.0, rateLimitIPConfigEntry.Tenancy.WriteRate)
//require.Equal(t, 100.0, rateLimitIPConfigEntry.PreparedQuery.ReadRate)
//require.Equal(t, 100.0, rateLimitIPConfigEntry.PreparedQuery.WriteRate)
require.Equal(t, 100.0, rateLimitIPConfigEntry.Session.ReadRate)
require.Equal(t, 100.0, rateLimitIPConfigEntry.Session.WriteRate)
require.Equal(t, 100.0, rateLimitIPConfigEntry.Txn.ReadRate)
require.Equal(t, 100.0, rateLimitIPConfigEntry.Txn.WriteRate, 100.0)
require.Equal(r, "permissive", rateLimitIPConfigEntry.Mode)
require.Equal(r, 100.0, rateLimitIPConfigEntry.ReadRate)
require.Equal(r, 100.0, rateLimitIPConfigEntry.WriteRate)
require.Equal(r, 100.0, rateLimitIPConfigEntry.ACL.ReadRate)
require.Equal(r, 100.0, rateLimitIPConfigEntry.ACL.WriteRate)
require.Equal(r, 100.0, rateLimitIPConfigEntry.Catalog.ReadRate)
require.Equal(r, 100.0, rateLimitIPConfigEntry.Catalog.WriteRate)
require.Equal(r, 100.0, rateLimitIPConfigEntry.ConfigEntry.ReadRate)
require.Equal(r, 100.0, rateLimitIPConfigEntry.ConfigEntry.WriteRate)
require.Equal(r, 100.0, rateLimitIPConfigEntry.ConnectCA.ReadRate)
require.Equal(r, 100.0, rateLimitIPConfigEntry.ConnectCA.WriteRate)
require.Equal(r, 100.0, rateLimitIPConfigEntry.Coordinate.ReadRate)
require.Equal(r, 100.0, rateLimitIPConfigEntry.Coordinate.WriteRate)
require.Equal(r, 100.0, rateLimitIPConfigEntry.DiscoveryChain.ReadRate)
require.Equal(r, 100.0, rateLimitIPConfigEntry.DiscoveryChain.WriteRate)
require.Equal(r, 100.0, rateLimitIPConfigEntry.Health.ReadRate)
require.Equal(r, 100.0, rateLimitIPConfigEntry.Health.WriteRate)
require.Equal(r, 100.0, rateLimitIPConfigEntry.Intention.ReadRate)
require.Equal(r, 100.0, rateLimitIPConfigEntry.Intention.WriteRate)
require.Equal(r, 100.0, rateLimitIPConfigEntry.KV.ReadRate)
require.Equal(r, 100.0, rateLimitIPConfigEntry.KV.WriteRate)
require.Equal(r, 100.0, rateLimitIPConfigEntry.Tenancy.ReadRate)
require.Equal(r, 100.0, rateLimitIPConfigEntry.Tenancy.WriteRate)
//require.Equal(r, 100.0, rateLimitIPConfigEntry.PreparedQuery.ReadRate)
//require.Equal(r, 100.0, rateLimitIPConfigEntry.PreparedQuery.WriteRate)
require.Equal(r, 100.0, rateLimitIPConfigEntry.Session.ReadRate)
require.Equal(r, 100.0, rateLimitIPConfigEntry.Session.WriteRate)
require.Equal(r, 100.0, rateLimitIPConfigEntry.Txn.ReadRate)
require.Equal(r, 100.0, rateLimitIPConfigEntry.Txn.WriteRate)

})
}
Expand Down
6 changes: 3 additions & 3 deletions control-plane/subcommand/create-federation-secret/command_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -528,7 +528,7 @@ func TestRun_WaitsForMeshGatewayInstances(t *testing.T) {
CAFile: caFile,
},
})
require.NoError(t, err)
require.NoError(r, err)
})

err = client.Agent().ServiceRegister(&api.AgentServiceRegistration{
Expand Down Expand Up @@ -825,7 +825,7 @@ func TestRun_ReplicationSecretDelay(t *testing.T) {
},
},
metav1.CreateOptions{})
require.NoError(t, err)
require.NoError(r, err)
})
}()

Expand Down Expand Up @@ -1005,7 +1005,7 @@ func TestRun_ConsulClientDelay(t *testing.T) {
Server: randomPorts[5],
}
})
require.NoError(t, err)
require.NoError(r, err)
})

// Construct Consul client.
Expand Down