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

Use context instead when cleaning up

Browse Source 
Signed-off-by: Kante Yin <kerthcet@gmail.com>
This commit is contained in:
Kante Yin 2023-02-17 17:13:35 +08:00
parent 014be8444a
commit ad55d0cbc9
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
test/integration/framework/test_server.go
View File

@ -65,12 +65,12 @@ func StartTestServer(t testing.TB, setup TestServerSetup) (client.Interface, *re
t.Fatalf("Couldn't create temp dir: %v", err) t.Fatalf("Couldn't create temp dir: %v", err)
} }
stopCh := make(chan struct{}) ctx, cancel := context.WithCancel(context.Background())
var errCh chan error var errCh chan error
tearDownFn := func() { tearDownFn := func() {
// Closing stopCh is stopping apiserver and cleaning up // Calling cancel function is stopping apiserver and cleaning up
// after itself, including shutting down its storage layer. // after itself, including shutting down its storage layer.
close(stopCh) cancel()
// If the apiserver was started, let's wait for it to // If the apiserver was started, let's wait for it to
// shutdown clearly. // shutdown clearly.
@ -173,7 +173,7 @@ func StartTestServer(t testing.TB, setup TestServerSetup) (client.Interface, *re
errCh = make(chan error) errCh = make(chan error)
go func() { go func() {
defer close(errCh) defer close(errCh)
if err := kubeAPIServer.GenericAPIServer.PrepareRun().Run(stopCh); err != nil { if err := kubeAPIServer.GenericAPIServer.PrepareRun().Run(ctx.Done()); err != nil {
errCh <- err errCh <- err
} }
}() }()
@ -203,15 +203,15 @@ func StartTestServer(t testing.TB, setup TestServerSetup) (client.Interface, *re
} }
healthStatus := 0 healthStatus := 0
kubeClient.Discovery().RESTClient().Get().AbsPath("/healthz").Do(context.TODO()).StatusCode(&healthStatus) kubeClient.Discovery().RESTClient().Get().AbsPath("/healthz").Do(ctx).StatusCode(&healthStatus)
if healthStatus != http.StatusOK { if healthStatus != http.StatusOK {
return false, nil return false, nil
} }
if _, err := kubeClient.CoreV1().Namespaces().Get(context.TODO(), "default", metav1.GetOptions{}); err != nil { if _, err := kubeClient.CoreV1().Namespaces().Get(ctx, "default", metav1.GetOptions{}); err != nil {
return false, nil return false, nil
} }
if _, err := kubeClient.CoreV1().Namespaces().Get(context.TODO(), "kube-system", metav1.GetOptions{}); err != nil { if _, err := kubeClient.CoreV1().Namespaces().Get(ctx, "kube-system", metav1.GetOptions{}); err != nil {
return false, nil return false, nil
} }