util: fix unstable test TestCheckCN (#37016)

ref #36866
pingcap · Aug 10, 2022 · c3d14dc · c3d14dc
1 parent 0ddf413
commit c3d14dc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/util/BUILD.bazel b/util/BUILD.bazel
@@ -63,6 +63,7 @@ go_test(
     data = glob(["tls_test/**"]),
     embed = [":util"],
     flaky = True,
+    shard_count = 2,
     deps = [
         "//config",
         "//kv",

diff --git a/util/security_test.go b/util/security_test.go
@@ -131,17 +131,16 @@ func TestCheckCN(t *testing.T) {
 
 	resp, err := util.ClientWithTLS(clientTLS1).Get(url)
 	require.NoError(t, err)
-	defer resp.Body.Close()
-	body, err := ioutil.ReadAll(resp.Body)
+	body, err := io.ReadAll(resp.Body)
 	require.NoError(t, err)
 	require.Equal(t, "This an example server", string(body))
+	require.NoError(t, resp.Body.Close())
 
 	// client2 can't visit server
 	resp, err = util.ClientWithTLS(clientTLS2).Get(url)
 	require.Regexp(t, ".*tls: bad certificate", err.Error())
 	if resp != nil {
-		err = resp.Body.Close()
-		require.NoError(t, err)
+		require.NoError(t, resp.Body.Close())
 	}
 }