github: fold security tests into 'tests'; update testing to 1.17-1.15 (…

…#4708)
grpc · Aug 26, 2021 · d074cae · d074cae
1 parent 0b372df
commit d074cae
Show file tree

Hide file tree

Showing 22 changed files with 32 additions and 10 deletions.
diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
@@ -41,32 +41,32 @@ jobs:
  matrix:
  include:
  - type: vet+tests
- goversion: 1.16
+ goversion: 1.17
 
  - type: tests
- goversion: 1.16
+ goversion: 1.17
  testflags: -race
 
  - type: tests
- goversion: 1.16
+ goversion: 1.17
  grpcenv: GRPC_GO_RETRY=on
 
  - type: extras
- goversion: 1.16
+ goversion: 1.17
 
  - type: tests
- goversion: 1.16
+ goversion: 1.17
  goarch: 386
 
  - type: tests
- goversion: 1.16
+ goversion: 1.17
  goarch: arm64
 
  - type: tests
- goversion: 1.15
+ goversion: 1.16
 
  - type: tests
- goversion: 1.14
+ goversion: 1.15
 
  steps:
  # Setup the environment.
@@ -104,6 +104,9 @@ jobs:
  run: |
  go version
  go test ${{ matrix.testflags }} -cpu 1,4 -timeout 7m google.golang.org/grpc/...
+ cd ${GITHUB_WORKSPACE}/security/advancedtls && go test ${{ matrix.testflags }} -timeout 2m google.golang.org/grpc/security/advancedtls/...
+ cd ${GITHUB_WORKSPACE}/security/authorization && go test ${{ matrix.testflags }} -timeout 2m google.golang.org/grpc/security/authorization/...
+
 
  # Non-core gRPC tests (examples, interop, etc)
  - name: Run extras tests
@@ -113,5 +116,3 @@ jobs:
  examples/examples_test.sh
  security/advancedtls/examples/examples_test.sh
  interop/interop_test.sh
- cd ${GITHUB_WORKSPACE}/security/advancedtls && go test -cpu 1,4 -timeout 7m google.golang.org/grpc/security/advancedtls/...
- cd ${GITHUB_WORKSPACE}/security/authorization && go test -cpu 1,4 -timeout 7m google.golang.org/grpc/security/authorization/...
diff --git a/channelz/service/func_nonlinux.go b/channelz/service/func_nonlinux.go
@@ -1,3 +1,4 @@
+//go:build !linux
 // +build !linux
 
 /*

diff --git a/channelz/service/service_sktopt_test.go b/channelz/service/service_sktopt_test.go
@@ -1,3 +1,4 @@
+//go:build linux && (386 || amd64)
 // +build linux
 // +build 386 amd64
 

diff --git a/channelz/service/util_sktopt_386_test.go b/channelz/service/util_sktopt_386_test.go
@@ -1,3 +1,4 @@
+//go:build 386 && linux
 // +build 386,linux
 
 /*

diff --git a/channelz/service/util_sktopt_amd64_test.go b/channelz/service/util_sktopt_amd64_test.go
@@ -1,3 +1,4 @@
+//go:build amd64 && linux
 // +build amd64,linux
 
 /*

diff --git a/credentials/alts/alts_test.go b/credentials/alts/alts_test.go
@@ -1,3 +1,4 @@
+//go:build linux || windows
 // +build linux windows
 
 /*

diff --git a/credentials/alts/utils_test.go b/credentials/alts/utils_test.go
@@ -1,3 +1,4 @@
+//go:build linux || windows
 // +build linux windows
 
 /*

diff --git a/internal/channelz/types_nonlinux.go b/internal/channelz/types_nonlinux.go
@@ -1,3 +1,4 @@
+//go:build !linux
 // +build !linux
 
 /*

diff --git a/internal/channelz/util_nonlinux.go b/internal/channelz/util_nonlinux.go
@@ -1,3 +1,4 @@
+//go:build !linux
 // +build !linux
 
 /*

diff --git a/internal/channelz/util_test.go b/internal/channelz/util_test.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*

diff --git a/internal/profiling/goid_modified.go b/internal/profiling/goid_modified.go
@@ -1,3 +1,4 @@
+//go:build grpcgoid
 // +build grpcgoid
 
 /*

diff --git a/internal/profiling/goid_regular.go b/internal/profiling/goid_regular.go
@@ -1,3 +1,4 @@
+//go:build !grpcgoid
 // +build !grpcgoid
 
 /*

diff --git a/internal/syscall/syscall_nonlinux.go b/internal/syscall/syscall_nonlinux.go
@@ -1,3 +1,4 @@
+//go:build !linux
 // +build !linux
 
 /*

diff --git a/internal/transport/proxy_test.go b/internal/transport/proxy_test.go
@@ -1,3 +1,4 @@
+//go:build !race
 // +build !race
 
 /*

diff --git a/test/authority_test.go b/test/authority_test.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*

diff --git a/test/race.go b/test/race.go
@@ -1,3 +1,4 @@
+//go:build race
 // +build race
 
 /*

diff --git a/test/tools/tools.go b/test/tools/tools.go
@@ -1,3 +1,4 @@
+//go:build tools
 // +build tools
 
 /*

diff --git a/xds/internal/httpfilter/fault/fault_test.go b/xds/internal/httpfilter/fault/fault_test.go
@@ -1,3 +1,4 @@
+//go:build !386
 // +build !386
 
 /*

diff --git a/xds/internal/test/xds_client_integration_test.go b/xds/internal/test/xds_client_integration_test.go
@@ -1,3 +1,4 @@
+//go:build !386
 // +build !386
 
 /*

diff --git a/xds/internal/test/xds_integration_test.go b/xds/internal/test/xds_integration_test.go
@@ -1,3 +1,4 @@
+//go:build !386
 // +build !386
 
 /*

diff --git a/xds/internal/test/xds_server_integration_test.go b/xds/internal/test/xds_server_integration_test.go
@@ -1,3 +1,4 @@
+//go:build !386
 // +build !386
 
 /*

diff --git a/xds/internal/test/xds_server_serving_mode_test.go b/xds/internal/test/xds_server_serving_mode_test.go
@@ -1,3 +1,4 @@
+//go:build !386
 // +build !386
 
 /*