Merge branch 'master' into http-abort-err

This commit is contained in:
thinkerou 2021-01-11 09:08:08 +08:00 committed by GitHub
commit 01c93c111d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 29 deletions

View File

@ -18,34 +18,6 @@ matrix:
env: env:
- TESTTAGS=nomsgpack - TESTTAGS=nomsgpack
- go: master - go: master
# Adding ppc64le jobs
- go: 1.11.x
arch: ppc64le
env: GO111MODULE=on
- go: 1.12.x
arch: ppc64le
env: GO111MODULE=on
- go: 1.13.x
arch: ppc64le
- go: 1.13.x
arch: ppc64le
env:
- TESTTAGS=nomsgpack
- go: 1.14.x
arch: ppc64le
- go: 1.14.x
arch: ppc64le
env:
- TESTTAGS=nomsgpack
- go: 1.15.x
arch: ppc64le
- go: 1.15.x
arch: ppc64le
env:
- TESTTAGS=nomsgpack
- go: master
arch: ppc64le
git: git:
depth: 10 depth: 10

View File

@ -14,6 +14,7 @@ import (
"net/http" "net/http"
"net/http/httptest" "net/http/httptest"
"os" "os"
"path/filepath"
"sync" "sync"
"testing" "testing"
"time" "time"
@ -146,7 +147,7 @@ func TestRunWithPort(t *testing.T) {
func TestUnixSocket(t *testing.T) { func TestUnixSocket(t *testing.T) {
router := New() router := New()
unixTestSocket := "/tmp/unix_unit_test" unixTestSocket := filepath.Join(os.TempDir(), "unix_unit_test")
defer os.Remove(unixTestSocket) defer os.Remove(unixTestSocket)