From 5ce887df8fb46bd7a533d7bf60b1be582644a0d6 Mon Sep 17 00:00:00 2001 From: Tom Barker Date: Thu, 19 Aug 2021 10:38:54 -0400 Subject: [PATCH] Make sure that Test_AllProcesses_cmdLine doesn't ignore failures. --- process/process_test.go | 46 +++++++++++++++++++++++++--------------------- v3/process/process_test.go | 46 +++++++++++++++++++++++++--------------------- 2 files changed, 50 insertions(+), 42 deletions(-) diff --git a/process/process_test.go b/process/process_test.go index 430ea50..8c59b1a 100644 --- a/process/process_test.go +++ b/process/process_test.go @@ -751,34 +751,38 @@ func Test_Process_Environ(t *testing.T) { func Test_AllProcesses_cmdLine(t *testing.T) { procs, err := Processes() - if err == nil { - for _, proc := range procs { - var exeName string - var cmdLine string - - exeName, _ = proc.Exe() - cmdLine, err = proc.Cmdline() - if err != nil { - cmdLine = "Error: " + err.Error() - } - - t.Logf("Process #%v: Name: %v / CmdLine: %v\n", proc.Pid, exeName, cmdLine) + skipIfNotImplementedErr(t, err) + if err != nil { + t.Fatalf("getting processes error %v", err) + } + for _, proc := range procs { + var exeName string + var cmdLine string + + exeName, _ = proc.Exe() + cmdLine, err = proc.Cmdline() + if err != nil { + cmdLine = "Error: " + err.Error() } + + t.Logf("Process #%v: Name: %v / CmdLine: %v\n", proc.Pid, exeName, cmdLine) } } func Test_AllProcesses_environ(t *testing.T) { procs, err := Processes() - if err == nil { - for _, proc := range procs { - exeName, _ := proc.Exe() - environ, err := proc.Environ() - if err != nil { - environ = []string{"Error: " + err.Error() } - } - - t.Logf("Process #%v: Name: %v / Environment Variables: %v\n", proc.Pid, exeName, environ) + skipIfNotImplementedErr(t, err) + if err != nil { + t.Fatalf("getting processes error %v", err) + } + for _, proc := range procs { + exeName, _ := proc.Exe() + environ, err := proc.Environ() + if err != nil { + environ = []string{"Error: " + err.Error()} } + + t.Logf("Process #%v: Name: %v / Environment Variables: %v\n", proc.Pid, exeName, environ) } } diff --git a/v3/process/process_test.go b/v3/process/process_test.go index 04f98ba..14238e7 100644 --- a/v3/process/process_test.go +++ b/v3/process/process_test.go @@ -753,34 +753,38 @@ func Test_Process_Environ(t *testing.T) { func Test_AllProcesses_cmdLine(t *testing.T) { procs, err := Processes() - if err == nil { - for _, proc := range procs { - var exeName string - var cmdLine string - - exeName, _ = proc.Exe() - cmdLine, err = proc.Cmdline() - if err != nil { - cmdLine = "Error: " + err.Error() - } - - t.Logf("Process #%v: Name: %v / CmdLine: %v\n", proc.Pid, exeName, cmdLine) + skipIfNotImplementedErr(t, err) + if err != nil { + t.Fatalf("getting processes error %v", err) + } + for _, proc := range procs { + var exeName string + var cmdLine string + + exeName, _ = proc.Exe() + cmdLine, err = proc.Cmdline() + if err != nil { + cmdLine = "Error: " + err.Error() } + + t.Logf("Process #%v: Name: %v / CmdLine: %v\n", proc.Pid, exeName, cmdLine) } } func Test_AllProcesses_environ(t *testing.T) { procs, err := Processes() - if err == nil { - for _, proc := range procs { - exeName, _ := proc.Exe() - environ, err := proc.Environ() - if err != nil { - environ = []string{"Error: " + err.Error() } - } - - t.Logf("Process #%v: Name: %v / Environment Variables: %v\n", proc.Pid, exeName, environ) + skipIfNotImplementedErr(t, err) + if err != nil { + t.Fatalf("getting processes error %v", err) + } + for _, proc := range procs { + exeName, _ := proc.Exe() + environ, err := proc.Environ() + if err != nil { + environ = []string{"Error: " + err.Error()} } + + t.Logf("Process #%v: Name: %v / Environment Variables: %v\n", proc.Pid, exeName, environ) } }