Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14151 from ahrtr/3.4_skip_TestWatchRequestProgress_proxy

Browse Source 
[3.4] Skip WatchRequestProgress test in grpc-proxy mode.
This commit is contained in:
Benjamin Wang 2022-06-29 05:40:05 +08:00 committed by GitHub
commit f169e5dcba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
clientv3/integration/watch_test.go
View File

@ -607,6 +607,9 @@ func TestConfigurableWatchProgressNotifyInterval(t *testing.T) {
} }
func TestWatchRequestProgress(t *testing.T) { func TestWatchRequestProgress(t *testing.T) {
if integration.ThroughProxy {
t.Skip("grpc-proxy does not support WatchProgress yet")
}
testCases := []struct { testCases := []struct {
name string name string
watchers []string watchers []string

2
integration/cluster_direct.go
View File

@ -23,7 +23,7 @@ import (
pb "go.etcd.io/etcd/etcdserver/etcdserverpb" pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
) )
const throughProxy = false const ThroughProxy = false
func toGRPC(c *clientv3.Client) grpcAPI { func toGRPC(c *clientv3.Client) grpcAPI {
return grpcAPI{ return grpcAPI{

2
integration/cluster_proxy.go
View File

@ -26,7 +26,7 @@ import (
"go.etcd.io/etcd/proxy/grpcproxy/adapter" "go.etcd.io/etcd/proxy/grpcproxy/adapter"
) )
const throughProxy = true const ThroughProxy = true
var ( var (
pmu sync.Mutex pmu sync.Mutex

2
integration/v3_watch_test.go
View File

@ -1242,7 +1242,7 @@ func TestV3WatchCancellation(t *testing.T) {
} }
var expected string var expected string
if throughProxy { if ThroughProxy {
// grpc proxy has additional 2 watches open // grpc proxy has additional 2 watches open
expected = "3" expected = "3"
} else { } else {

3
proxy/grpcproxy/watch.go
View File

@ -262,7 +262,8 @@ func (wps *watchProxyStream) recvLoop() error {
case *pb.WatchRequest_CancelRequest: case *pb.WatchRequest_CancelRequest:
wps.delete(uv.CancelRequest.WatchId) wps.delete(uv.CancelRequest.WatchId)
default: default:
panic("not implemented") // Panic or Fatalf would allow network clients to crash the serve remotely.
//panic("not implemented")
} }
} }
} }