From 4235850823bbe1bb07a6ea9e05d738bf3348fb18 Mon Sep 17 00:00:00 2001 From: gengliqi Date: Tue, 25 Jul 2023 20:55:48 +0800 Subject: [PATCH] update test Signed-off-by: gengliqi --- server/http_handler_test.go | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/server/http_handler_test.go b/server/http_handler_test.go index 467a86f571650..03c3a846669f0 100644 --- a/server/http_handler_test.go +++ b/server/http_handler_test.go @@ -24,6 +24,7 @@ import ( "encoding/json" "fmt" "io" + "math/rand" "net" "net/http" "net/http/httptest" @@ -1206,7 +1207,9 @@ func TestSetLabelsConcurrentWithGetLabel(t *testing.T) { ts.startServer(t) defer ts.stopServer(t) - testUpdateLabels := func(labels, expected map[string]string) { + testUpdateLabels := func() { + labels := map[string]string{} + labels["zone"] = fmt.Sprintf("z-%v", rand.Intn(100000)) buffer := bytes.NewBuffer([]byte{}) require.Nil(t, json.NewEncoder(buffer).Encode(labels)) resp, err := ts.postStatus("/labels", "application/json", buffer) @@ -1217,29 +1220,23 @@ func TestSetLabelsConcurrentWithGetLabel(t *testing.T) { }() require.Equal(t, http.StatusOK, resp.StatusCode) newLabels := config.GetGlobalConfig().Labels - require.Equal(t, newLabels, expected) - } - - labels := map[string]string{ - "zone": "us-west-1", - "test": "123", - } - - testUpdateLabels(labels, labels) - - updated := map[string]string{ - "zone": "bj-1", + require.Equal(t, newLabels, labels) } - labels["zone"] = "bj-1" - + done := make(chan struct{}) go func() { - for i := 0; i < 100; i++ { - config.GetGlobalConfig().GetTiKVConfig() + for { + select { + case <-done: + return + default: + config.GetGlobalConfig().GetTiKVConfig() + } } }() for i := 0; i < 100; i++ { - testUpdateLabels(updated, labels) + testUpdateLabels() } + close(done) // reset the global variable config.GetGlobalConfig().Labels = map[string]string{}