Merge branch 'master' into sasl

Author: pingkui

.codecov.yaml

@@ -2,7 +2,7 @@ coverage:
   status:
     patch:
       default:
-        target: 75%
+        target: 80%
     project:
       default:
-        threshold: 1%
+        threshold: 76%

.devcontainer/devcontainer.json

@@ -0,0 +1,11 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+// README at: https://github.com/devcontainers/templates/tree/main/src/go
+{
+	"name": "Go",
+	// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
+	"image": "mcr.microsoft.com/devcontainers/go:0-1-bullseye",
+	"features": {
+		"ghcr.io/devcontainers/features/java:1": {
+		}
+	}
+}

.gitattributes

@@ -0,0 +1 @@
+* text eol=lf

.github/workflows/integration.yaml

@@ -0,0 +1,42 @@
+name: integration_test
+on:
+  push:
+    branches:
+    - master
+  pull_request:
+    branches:
+    - master
+
+jobs:
+  integration_test:
+    name: integration_test
+    strategy:
+      matrix:
+        zk-version: [3.5.8, 3.6.1]
+        go-version: ['oldstable', 'stable']
+    runs-on: ubuntu-latest
+    steps:
+      - name: Go ${{ matrix.go-version }} setup
+        uses: actions/setup-go@v4
+        with:
+            go-version: ${{ matrix.go-version }} 
+
+      - name: Setup Java 14
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          java-version: 14
+
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Test code
+        run: make test ZK_VERSION=${{ matrix.zk-version }}
+
+      - name: Upload code coverage
+        # only upload one result from the matrix. 
+        if: ${{ strategy.job-index == 0 }}
+        uses: codecov/codecov-action@v4
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }} # required
+          file: ./profile.cov

.github/workflows/lint.yaml

@@ -1,6 +1,7 @@
 
 name: lint
 on: [pull_request]
+
 jobs:
   lint:
     name: lint

.github/workflows/stale.yml

@@ -0,0 +1,35 @@
+# This workflow warns and then closes issues and PRs that have had no activity for a specified amount of time.
+#
+# You can adjust the behavior by modifying this file.
+# For more information, see:
+# https://github.com/actions/stale
+name: Mark stale issues and pull requests
+
+on:
+  schedule:
+  - cron: '0 12 * * *'
+
+jobs:
+  stale:
+
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: write
+
+    steps:
+    - uses: actions/stale@v9
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        stale-issue-label: 'no-issue-activity'
+        stale-pr-label: 'no-pr-activity'
+        days-before-stale: 180
+        days-before-issue-stale: 730
+        days-before-close: 30
+        days-before-pr-close: -1
+        stale-pr-message: 'Stale pull request detected at 180 days. Please update, comment, or rebase.'
+        stale-issue-message: 'This issue is marked as stale. If you want to keep this issue open, please leave a comment, otherwise the issue will be closed due to inactivity.'
+        close-issue-message: "This issue has been closed due to inactivity after being stale for 30 days."
+        debug-only: true
+        exempt-all-milestones: true
+        

.github/workflows/unittest.yaml

@@ -1,32 +1,27 @@
 name: unittest
-on: [push, pull_request]
-
+on:
+  push:
+    branches:
+    - master
+  pull_request:
+    branches:
+    - master
+    
 jobs:
   unittest:
     name: unittest
     strategy:
       matrix:
-        zk-version: [3.5.8, 3.6.1]
-        go-version: [1.13.x, 1.14.x]
+        go-version: ['oldstable', 'stable']
     runs-on: ubuntu-latest
     steps:
-      - name: Setup Go
-        uses: actions/setup-go@v1
+      - name: Go ${{ matrix.go-version }} setup
+        uses: actions/setup-go@v4
         with:
             go-version: ${{ matrix.go-version }} 
 
-      - name: Setup Java
-        uses: actions/setup-java@v1
-        with:
-          java-version: 14
-
       - name: Checkout code
-        uses: actions/checkout@v1
+        uses: actions/checkout@v3
 
-      - name: Test code
-        run: make test ZK_VERSION=${{ matrix.zk-version }}
-
-      - name: Upload code coverage
-        uses: codecov/codecov-action@v1
-        with:
-          file: ./profile.cov
+      - name: Run unittest ${{ matrix.go-version }}
+        run: make unittest 

CONTRIBUTION.md

@@ -2,7 +2,7 @@
 
 ## **Did you find a bug?**
 
-* **Ensure the bug was not already reported** by searching on GitHub under [Issues](https://github.com/go-zookeper/zk/issues).
+* **Ensure the bug was not already reported** by searching on GitHub under [Issues](https://github.com/go-zookeeper/zk/issues).
 
 * If you're unable to find an open issue addressing the problem, open a new one.
   * Be sure to include a title and clear description.

Makefile

@@ -37,6 +37,10 @@ lint:
 build:
 	go build ./...
 
+.PHONY: unittest
+unittest:
+	go test -timeout 500s -v -race -covermode atomic -skip=Integration ./...
+
 .PHONY: test
 test: build zookeeper
 	go test -timeout 500s -v -race -covermode atomic -coverprofile=profile.cov $(PACKAGES)

README.md

@@ -2,10 +2,10 @@ Native Go Zookeeper Client Library
 ===================================
 
 [![GoDoc](https://godoc.org/github.com/go-zookeeper/zk?status.svg)](https://godoc.org/github.com/go-zookeeper/zk)
-[![Build Status](https://img.shields.io/github/workflow/status/go-zookeeper/zk/unittest/master)](https://github.com/go-zookeeper/zk/actions?query=branch%3Amaster)
+[![unittest](https://github.com/go-zookeeper/zk/actions/workflows/unittest.yaml/badge.svg?branch=master&event=push)](https://github.com/go-zookeeper/zk/actions/workflows/unittest.yaml)
 [![Coverage Status](https://img.shields.io/codecov/c/github/go-zookeeper/zk/master)](https://codecov.io/gh/go-zookeeper/zk/branch/master)
 
 License
 -------
 
-3-clause BSD. See LICENSE file.
+3-clause BSD. See [LICENSE](LICENSE) file.

cluster_test.go

@@ -16,7 +16,7 @@ func (lw logWriter) Write(b []byte) (int, error) {
 	return len(b), nil
 }
 
-func TestBasicCluster(t *testing.T) {
+func TestIntegration_BasicCluster(t *testing.T) {
 	ts, err := StartTestCluster(t, 3, nil, logWriter{t: t, p: "[ZKERR] "})
 	if err != nil {
 		t.Fatal(err)
@@ -33,8 +33,6 @@ func TestBasicCluster(t *testing.T) {
 	}
 	defer zk2.Close()
 
-	time.Sleep(time.Second * 5)
-
 	if _, err := zk1.Create("/gozk-test", []byte("foo-cluster"), 0, WorldACL(PermAll)); err != nil {
 		t.Fatalf("Create failed on node 1: %+v", err)
 	}
@@ -51,7 +49,7 @@ func TestBasicCluster(t *testing.T) {
 }
 
 // If the current leader dies, then the session is reestablished with the new one.
-func TestClientClusterFailover(t *testing.T) {
+func TestIntegration_ClientClusterFailover(t *testing.T) {
 	tc, err := StartTestCluster(t, 3, nil, logWriter{t: t, p: "[ZKERR] "})
 	if err != nil {
 		t.Fatal(err)
@@ -93,7 +91,7 @@ func TestClientClusterFailover(t *testing.T) {
 
 // If a ZooKeeper cluster looses quorum then a session is reconnected as soon
 // as the quorum is restored.
-func TestNoQuorum(t *testing.T) {
+func TestIntegration_NoQuorum(t *testing.T) {
 	tc, err := StartTestCluster(t, 3, nil, logWriter{t: t, p: "[ZKERR] "})
 	if err != nil {
 		t.Fatal(err)
@@ -189,7 +187,7 @@ func TestNoQuorum(t *testing.T) {
 	}
 }
 
-func TestWaitForClose(t *testing.T) {
+func TestIntegration_WaitForClose(t *testing.T) {
 	ts, err := StartTestCluster(t, 1, nil, logWriter{t: t, p: "[ZKERR] "})
 	if err != nil {
 		t.Fatal(err)
@@ -225,7 +223,7 @@ CONNECTED:
 	}
 }
 
-func TestBadSession(t *testing.T) {
+func TestIntegration_BadSession(t *testing.T) {
 	ts, err := StartTestCluster(t, 1, nil, logWriter{t: t, p: "[ZKERR] "})
 	if err != nil {
 		t.Fatal(err)