Skip to content

Commit

Permalink
apply review comments
Browse files Browse the repository at this point in the history
Signed-off-by: NikitaSkrynnik <[email protected]>
  • Loading branch information
NikitaSkrynnik committed Aug 8, 2024
1 parent 3902dd6 commit ebe2ff4
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
6 changes: 1 addition & 5 deletions pkg/networkservice/common/begin/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,6 @@ import (
"github.com/networkservicemesh/sdk/pkg/networkservice/core/next"
)

const (
closeTimeout = time.Minute
)

type beginServer struct {
genericsync.Map[string, *eventFactoryServer]
closeTimeout time.Duration
Expand All @@ -45,7 +41,7 @@ func NewServer(opts ...Option) networkservice.NetworkServiceServer {
o := &option{
cancelCtx: context.Background(),
reselect: false,
closeTimeout: closeTimeout,
closeTimeout: time.Minute,
}

for _, opt := range opts {
Expand Down
2 changes: 2 additions & 0 deletions pkg/networkservice/common/begin/server_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ func TestBeginWorksWithSmallTimeout(t *testing.T) {
request := testRequest("id")
_, err := server.Request(requestCtx, request)
require.EqualError(t, err, context.DeadlineExceeded.Error())
require.Equal(t, int32(0), waitSrv.requestDone.Load())
require.Eventually(t, func() bool {
return waitSrv.requestDone.Load() == 1
}, waitTime*2, time.Millisecond*500)
Expand All @@ -76,6 +77,7 @@ func TestBeginWorksWithSmallTimeout(t *testing.T) {
defer cancel()
_, err = server.Close(closeCtx, request.Connection)
require.EqualError(t, err, context.DeadlineExceeded.Error())
require.Equal(t, int32(0), waitSrv.closeDone.Load())
require.Eventually(t, func() bool {
return waitSrv.closeDone.Load() == 1
}, waitTime*2, time.Millisecond*500)
Expand Down

0 comments on commit ebe2ff4

Please sign in to comment.