github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 09:22:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #127974 from jpbetz/mvp-test-cleanup

Browse Source 
peerproxy flake: Use t.Cleanup instead of defer to shut down servers
This commit is contained in:
Kubernetes Prow Robot 2024-10-10 03:54:22 +01:00 committed by GitHub
commit fe218437e0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
test/integration/apiserver/peerproxy/peer_proxy_test.go
View File

@ -52,7 +52,9 @@ func TestPeerProxiedRequest(t *testing.T) {
ktesting.SetDefaultVerbosity(1) ktesting.SetDefaultVerbosity(1)
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Minute) ctx, cancel := context.WithTimeout(context.Background(), 5*time.Minute)
t.Cleanup(cancel) defer func() {
t.Cleanup(cancel) // register context cancellation last so it is cleaned up before servers
}()
// ensure to stop cert reloading after shutdown // ensure to stop cert reloading after shutdown
transport.DialerStopCh = ctx.Done() transport.DialerStopCh = ctx.Done()
@ -76,7 +78,7 @@ func TestPeerProxiedRequest(t *testing.T) {
EnableCertAuth: true, EnableCertAuth: true,
ProxyCA: &proxyCA}, ProxyCA: &proxyCA},
[]string{}, etcd) []string{}, etcd)
defer serverA.TearDownFn() t.Cleanup(serverA.TearDownFn)
// start another test server with some api disabled // start another test server with some api disabled
// override hostname to ensure unique ips // override hostname to ensure unique ips
@ -85,7 +87,7 @@ func TestPeerProxiedRequest(t *testing.T) {
EnableCertAuth: true, EnableCertAuth: true,
ProxyCA: &proxyCA}, ProxyCA: &proxyCA},
[]string{fmt.Sprintf("--runtime-config=%s", "batch/v1=false")}, etcd) []string{fmt.Sprintf("--runtime-config=%s", "batch/v1=false")}, etcd)
defer serverB.TearDownFn() t.Cleanup(serverB.TearDownFn)
kubeClientSetA, err := kubernetes.NewForConfig(serverA.ClientConfig) kubeClientSetA, err := kubernetes.NewForConfig(serverA.ClientConfig)
require.NoError(t, err) require.NoError(t, err)
@ -113,7 +115,9 @@ func TestPeerProxiedRequestToThirdServerAfterFirstDies(t *testing.T) {
ktesting.SetDefaultVerbosity(1) ktesting.SetDefaultVerbosity(1)
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Minute) ctx, cancel := context.WithTimeout(context.Background(), 5*time.Minute)
t.Cleanup(cancel) defer func() {
t.Cleanup(cancel) // register context cancellation last so it is cleaned up before servers
}()
// ensure to stop cert reloading after shutdown // ensure to stop cert reloading after shutdown
transport.DialerStopCh = ctx.Done() transport.DialerStopCh = ctx.Done()
@ -157,7 +161,7 @@ func TestPeerProxiedRequestToThirdServerAfterFirstDies(t *testing.T) {
t.Log("starting apiserver for ServerB") t.Log("starting apiserver for ServerB")
serverB := kastesting.StartTestServerOrDie(t, &kastesting.TestServerInstanceOptions{EnableCertAuth: true, ProxyCA: &proxyCA}, []string{ serverB := kastesting.StartTestServerOrDie(t, &kastesting.TestServerInstanceOptions{EnableCertAuth: true, ProxyCA: &proxyCA}, []string{
fmt.Sprintf("--runtime-config=%v", "batch/v1=false")}, etcd) fmt.Sprintf("--runtime-config=%v", "batch/v1=false")}, etcd)
defer serverB.TearDownFn() t.Cleanup(serverB.TearDownFn)
kubeClientSetB, err := kubernetes.NewForConfig(serverB.ClientConfig) kubeClientSetB, err := kubernetes.NewForConfig(serverB.ClientConfig)
require.NoError(t, err) require.NoError(t, err)
// ensure storageversion garbage collector ctlr is set up // ensure storageversion garbage collector ctlr is set up
@ -169,7 +173,7 @@ func TestPeerProxiedRequestToThirdServerAfterFirstDies(t *testing.T) {
server.SetHostnameFuncForTests("test-server-c") server.SetHostnameFuncForTests("test-server-c")
t.Log("starting apiserver for ServerC") t.Log("starting apiserver for ServerC")
serverC := kastesting.StartTestServerOrDie(t, &kastesting.TestServerInstanceOptions{EnableCertAuth: true, ProxyCA: &proxyCA}, []string{}, etcd) serverC := kastesting.StartTestServerOrDie(t, &kastesting.TestServerInstanceOptions{EnableCertAuth: true, ProxyCA: &proxyCA}, []string{}, etcd)
defer serverC.TearDownFn() t.Cleanup(serverC.TearDownFn)
// create jobs resource using serverA // create jobs resource using serverA
job := createJobResource() job := createJobResource()