Remove a duplicate test. Also move the counter file to a temp dir.

There are multiple tests sharing the same counter file - if they end up
running at the same time in different shards, then they can conflict
with each other, effectively making the test flaky.

This ought to fix it. I hope.

--
MOS_MIGRATED_REVID=131715434

1 files changed, 1 insertions, 11 deletions

diff --git a/src/test/shell/bazel/bazel_test_test.sh b/src/test/shell/bazel/bazel_test_test.sh
index 1c98a6991d..073a3a6949 100755
--- a/src/test/shell/bazel/bazel_test_test.sh
+++ b/src/test/shell/bazel/bazel_test_test.sh
@@ -21,10 +21,7 @@ source $(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/test-setup.sh \
   || { echo "test-setup.sh not found!" >&2; exit 1; }
 
 function set_up_jobcount() {
-  tmp=${TEST_TMPDIR}/testjobs
-  # Cleanup the tempory directory
-  rm -fr ${tmp}
-  mkdir -p ${tmp}
+  tmp=$(mktemp -d ${TEST_TMPDIR}/testjobs.XXXXXXXX)
 
   # We use hardlinks to this file as a communication mechanism between
   # test runs.
@@ -82,13 +79,6 @@ function test_3_local_jobs() {
     --runs_per_test=10 //dir:test
 }
 
-function test_unlimited_local_jobs() {
-  set_up_jobcount
-  # unlimited local test jobs, so local resources enforces 3 tests in parallel.
-  bazel test --spawn_strategy=standalone --test_output=errors \
-    --local_resources=10000,3,100 --runs_per_test=10 //dir:test
-}
-
 function test_tmpdir() {
   mkdir -p foo
   cat > foo/bar_test.sh <<'EOF'