Merge branch 'master' into enable_race_and_update_config

pingcap · Jun 9, 2022 · 75911f5 · 75911f5
2 parents 65b4925 + 355d66d
commit 75911f5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/planner/core/BUILD.bazel b/planner/core/BUILD.bazel
@@ -187,6 +187,8 @@ go_test(
     ],
     data = glob(["testdata/**"]),
     embed = [":core"],
+    flaky = True,
+    shard_count = 50,
     deps = [
         "//config",
         "//ddl",

diff --git a/util/watcher/BUILD.bazel b/util/watcher/BUILD.bazel
@@ -18,5 +18,6 @@ go_test(
     name = "watcher_test",
     srcs = ["watcher_test.go"],
     embed = [":watcher"],
+    flaky = True,
     deps = ["@com_github_stretchr_testify//require"],
 )