From 4f6840ad694f7a1524f13c3b11d7387affec2158 Mon Sep 17 00:00:00 2001 From: Vivek Lakshmanan Date: Wed, 2 Dec 2020 16:04:14 -0800 Subject: [PATCH] Fix linting issues --- sdk/python/cmdutils_unix.go | 2 ++ sdk/python/cmdutils_windows.go | 2 ++ sdk/python/python_test.go | 1 + sdk/python/wrappedcmd.go | 2 +- sdk/python/wrappedcmd_test.go | 4 ++-- 5 files changed, 8 insertions(+), 3 deletions(-) diff --git a/sdk/python/cmdutils_unix.go b/sdk/python/cmdutils_unix.go index cf6bb22fb..69b50ab55 100644 --- a/sdk/python/cmdutils_unix.go +++ b/sdk/python/cmdutils_unix.go @@ -4,6 +4,8 @@ package python import "os" +// Check if file supports reparse point in windows. +// This is to trigger a workaround for https://github.com/golang/go/issues/42919 func isReparsePoint(info os.FileInfo) bool { return false } diff --git a/sdk/python/cmdutils_windows.go b/sdk/python/cmdutils_windows.go index 03f9e36b2..4fe5aec95 100644 --- a/sdk/python/cmdutils_windows.go +++ b/sdk/python/cmdutils_windows.go @@ -5,6 +5,8 @@ import ( "syscall" ) +// Check if file supports reparse point in windows. +// This is to trigger a workaround for https://github.com/golang/go/issues/42919 func isReparsePoint(info os.FileInfo) bool { if sys, ok := info.Sys().(*syscall.Win32FileAttributeData); ok { return sys.FileAttributes&syscall.FILE_ATTRIBUTE_REPARSE_POINT != 0 && diff --git a/sdk/python/python_test.go b/sdk/python/python_test.go index dc4281674..1c0759012 100644 --- a/sdk/python/python_test.go +++ b/sdk/python/python_test.go @@ -116,6 +116,7 @@ func TestRunningPipInVirtualEnvironment(t *testing.T) { WithDir(tempdir), WithEnv(ActivateVirtualEnv(os.Environ(), venvDir)), ) + assert.NoError(t, err) asWrappedCmd := pipCmd.(*wrappedCmd) asWrappedCmd.useStartProcess = forceStartProcess diff --git a/sdk/python/wrappedcmd.go b/sdk/python/wrappedcmd.go index fc7e60939..c24e95faa 100644 --- a/sdk/python/wrappedcmd.go +++ b/sdk/python/wrappedcmd.go @@ -268,7 +268,7 @@ func dedupEnvCase(caseInsensitive bool, env []string) []string { // two interfaces with non-comparable underlying types. func interfaceEqual(a, b interface{}) bool { defer func() { - recover() + _ = recover() }() return a == b } diff --git a/sdk/python/wrappedcmd_test.go b/sdk/python/wrappedcmd_test.go index c3d27285b..cbd45f22a 100644 --- a/sdk/python/wrappedcmd_test.go +++ b/sdk/python/wrappedcmd_test.go @@ -33,11 +33,11 @@ func Test_wrappedCmd_CombinedOutputIsSame(t *testing.T) { } { t.Run(tt.name, func(t *testing.T) { execCmd := &wrappedCmd{ - cmd: exec.Command("python", tt.args...), + cmd: exec.Command("python", tt.args...), //nolint } execCmdOut := getCmdOutput(t, execCmd) startProc := &wrappedCmd{ - cmd: exec.Command("python", tt.args...), + cmd: exec.Command("python", tt.args...), //nolint useStartProcess: true, } assert.NotEmpty(t, execCmdOut)