cleanup

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>
networkservicemesh · Apr 7, 2022 · 4498903 · 4498903
1 parent fc2990b
commit 4498903
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 14 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -22,7 +22,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [windows-latest]
+        os: [ubuntu-latest, macos-latest, windows-latest]
     steps:
       - name: Check out code
         uses: actions/checkout@v2
@@ -33,7 +33,8 @@ jobs:
       - name: Build
         run: go build -race  ./...
       - name: Test
-        run: go test -race ./... -run Test_RefreshNSEClient_SetsCorrectExpireTime -count 10000 -timeout 2000m
+        run: go test -race ./... 				log.FromContext(c.ctx).Infof("[REFRESH] Reregister end")
+
   golangci-lint:
     name: golangci-lint
     runs-on: ubuntu-latest

diff --git a/pkg/registry/common/refresh/nse_registry_client.go b/pkg/registry/common/refresh/nse_registry_client.go
@@ -27,7 +27,6 @@ import (
 	"github.com/networkservicemesh/sdk/pkg/registry/common/begin"
 	"github.com/networkservicemesh/sdk/pkg/registry/core/next"
 	"github.com/networkservicemesh/sdk/pkg/tools/clock"
-	"github.com/networkservicemesh/sdk/pkg/tools/log"
 )
 
 type refreshNSEClient struct {
@@ -70,9 +69,7 @@ func (c *refreshNSEClient) Register(ctx context.Context, nse *registry.NetworkSe
 			case <-refreshCtx.Done():
 				return
 			case <-refreshCh:
-				log.FromContext(c.ctx).Infof("[REFRESH] Reregister begin")
 				<-factory.Register(begin.CancelContext(refreshCtx))
-				log.FromContext(c.ctx).Infof("[REFRESH] Reregister end")
 			}
 		}()
 	}

diff --git a/pkg/registry/common/refresh/nse_registry_client_test.go b/pkg/registry/common/refresh/nse_registry_client_test.go
@@ -39,13 +39,11 @@ import (
 	"github.com/networkservicemesh/sdk/pkg/tools/clock"
 	"github.com/networkservicemesh/sdk/pkg/tools/clockmock"
 	"github.com/networkservicemesh/sdk/pkg/tools/interdomain"
-	"github.com/networkservicemesh/sdk/pkg/tools/log"
-	"github.com/networkservicemesh/sdk/pkg/tools/log/logruslogger"
 )
 
 const (
 	expireTimeout = 3 * time.Minute
-	testWait      = 400 * time.Millisecond
+	testWait      = 100 * time.Millisecond
 	testTick      = testWait / 100
 )
 
@@ -228,9 +226,6 @@ func Test_RefreshNSEClient_SetsCorrectExpireTime(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
-	logger := logruslogger.New(ctx)
-	ctx = log.WithLog(ctx, logger)
-
 	clockMock := clockmock.New(ctx)
 	ctx = clock.WithClock(ctx, clockMock)
 
@@ -251,11 +246,9 @@ func Test_RefreshNSEClient_SetsCorrectExpireTime(t *testing.T) {
 		count := int32(i)
 
 		clockMock.Add(expireTimeout / 3 * 2)
-		logger.Info("[TEST] require.Eventually begin")
 		require.Eventually(t, func() bool {
 			return atomic.LoadInt32(&countClient.requestCount) > count
-		}, testWait, testTick)
-		logger.Info("[TEST] require.Eventually end")
+		}, 4*testWait, testTick)
 
 		// Wait for the Refresh to fully happen
 		time.Sleep(testWait)