Etcd test2

.github/workflows/pd-tests.yaml

@@ -23,13 +23,13 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        worker_id: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13]
+        worker_id: [1]
     outputs:
-      job-total: 13
+      job-total: 1
     steps:
       - uses: actions/setup-go@v3
         with:
-          go-version: '1.21'
+          go-version: "1.21"
       - name: Checkout code
         uses: actions/checkout@v3
       - name: Restore cache
@@ -48,31 +48,31 @@ jobs:
           JOB_COUNT: 10 # 11, 12 13 are for other integrations jobs
         run: |
           make ci-test-job JOB_COUNT=$(($JOB_COUNT)) JOB_INDEX=$WORKER_ID
-          mv covprofile covprofile_$WORKER_ID
-          sed -i "/failpoint_binding/d" covprofile_$WORKER_ID
-      - name: Upload coverage result ${{ matrix.worker_id }}
-        uses: actions/upload-artifact@v2
-        with:
-          name: cover-reports
-          path: covprofile_${{ matrix.worker_id }}
-  report-coverage:
-    needs: chunks
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-      - name: Download chunk report
-        uses: actions/download-artifact@v2
-        with:
-          name: cover-reports
-      - name: Merge
-        env:
-          TOTAL_JOBS: ${{needs.chunks.outputs.job-total}}
-        run: for i in $(seq 1 $TOTAL_JOBS); do cat covprofile_$i >> covprofile; done
-      - name: Send coverage
-        uses: codecov/codecov-action@v1
-        with:
-          token: ${{ secrets.CODECOV }}
-          file: ./covprofile
-          flags: unittests
-          name: codecov-umbrella
+  #         mv covprofile covprofile_$WORKER_ID
+  #         sed -i "/failpoint_binding/d" covprofile_$WORKER_ID
+  #     - name: Upload coverage result ${{ matrix.worker_id }}
+  #       uses: actions/upload-artifact@v2
+  #       with:
+  #         name: cover-reports
+  #         path: covprofile_${{ matrix.worker_id }}
+  # report-coverage:
+  #   needs: chunks
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - name: Checkout code
+  #       uses: actions/checkout@v3
+  #     - name: Download chunk report
+  #       uses: actions/download-artifact@v2
+  #       with:
+  #         name: cover-reports
+  #     - name: Merge
+  #       env:
+  #         TOTAL_JOBS: ${{needs.chunks.outputs.job-total}}
+  #       run: for i in $(seq 1 $TOTAL_JOBS); do cat covprofile_$i >> covprofile; done
+  #     # - name: Send coverage
+  #     #   uses: codecov/codecov-action@v1
+  #     #   with:
+  #     #     token: ${{ secrets.CODECOV }}
+  #     #     file: ./covprofile
+  #     #     flags: unittests
+  #     #     name: codecov-umbrella

Makefile

@@ -226,11 +226,8 @@ basic-test: install-tools
 
 ci-test-job: install-tools dashboard-ui
 	@$(FAILPOINT_ENABLE)
-	if [[ $(JOB_INDEX) -le 10 ]]; then \
-	CGO_ENABLED=1 go test -timeout=15m -tags deadlock -race -covermode=atomic -coverprofile=covprofile -coverpkg=./... $(shell ./scripts/ci-subtask.sh $(JOB_COUNT) $(JOB_INDEX)); \
-	else \
-	for mod in $(shell ./scripts/ci-subtask.sh $(JOB_COUNT) $(JOB_INDEX)); do cd $$mod && $(MAKE) ci-test-job && cd $(ROOT_PATH) > /dev/null && cat $$mod/covprofile >> covprofile; done; \
-	fi
+	CGO_ENABLED=1 go test -timeout=15m -tags deadlock -race github.com/tikv/pd/pkg/election github.com/tikv/pd/pkg/utils/etcdutil
+	@$(FAILPOINT_DISABLE)
 
 TSO_INTEGRATION_TEST_PKGS := $(PD_PKG)/tests/server/tso
 

pkg/audit/audit_test.go

@@ -24,11 +24,11 @@ import (
 	"testing"
 	"time"
 
-	"github.com/pingcap/log"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	"github.com/stretchr/testify/require"
 	"github.com/tikv/pd/pkg/utils/requestutil"
+	"github.com/tikv/pd/pkg/utils/testutil"
 )
 
 func TestLabelMatcher(t *testing.T) {
@@ -93,7 +93,7 @@ func TestLocalLogBackendUsingFile(t *testing.T) {
 	t.Parallel()
 	re := require.New(t)
 	backend := NewLocalLogBackend(true)
-	fname := initLog()
+	fname := testutil.InitTempFileLogger("info")
 	defer os.Remove(fname)
 	req, _ := http.NewRequest(http.MethodGet, "http://127.0.0.1:2379/test?test=test", strings.NewReader("testBody"))
 	re.False(backend.ProcessHTTPRequest(req))
@@ -125,7 +125,7 @@ func BenchmarkLocalLogAuditUsingTerminal(b *testing.B) {
 func BenchmarkLocalLogAuditUsingFile(b *testing.B) {
 	b.StopTimer()
 	backend := NewLocalLogBackend(true)
-	fname := initLog()
+	fname := testutil.InitTempFileLogger("info")
 	defer os.Remove(fname)
 	req, _ := http.NewRequest(http.MethodGet, "http://127.0.0.1:2379/test?test=test", strings.NewReader("testBody"))
 	b.StartTimer()
@@ -135,15 +135,3 @@ func BenchmarkLocalLogAuditUsingFile(b *testing.B) {
 		backend.ProcessHTTPRequest(req)
 	}
 }
-
-func initLog() string {
-	cfg := &log.Config{}
-	f, _ := os.CreateTemp("/tmp", "pd_tests")
-	fname := f.Name()
-	f.Close()
-	cfg.File.Filename = fname
-	cfg.Level = "info"
-	lg, p, _ := log.InitLogger(cfg)
-	log.ReplaceGlobals(lg, p)
-	return fname
-}