Merge pull request #321 from stkw0/master

cmd_test: find echo from PATH instead of using a hardcoded path
markusressel · Oct 8, 2024 · 380f590 · 380f590
2 parents fe56dd3 + 66d4ad1
commit 380f590
Showing 1 changed file with 13 additions and 6 deletions.
diff --git a/internal/fans/cmd_test.go b/internal/fans/cmd_test.go
@@ -5,8 +5,15 @@ import (
 	"github.com/markusressel/fan2go/internal/util"
 	"github.com/stretchr/testify/assert"
 	"testing"
+	"os/exec"
 )
 
+func getEchoPath() string {
+	// unlikely to fail
+	p, _ := exec.LookPath("echo")
+	return p
+}
+
 func TestCmdFan_NewFan(t *testing.T) {
 	// GIVEN
 	config := configuration.FanConfig{
@@ -132,7 +139,7 @@ func TestCmdFan_GetRpm(t *testing.T) {
 	config := configuration.FanConfig{
 		Cmd: &configuration.CmdFanConfig{
 			GetRpm: &configuration.ExecConfig{
-				Exec: "/usr/bin/echo",
+				Exec: getEchoPath(),
 				Args: []string{"1000"},
 			},
 		},
@@ -171,7 +178,7 @@ func TestCmdFan_GetRpm_ParseError(t *testing.T) {
 	config := configuration.FanConfig{
 		Cmd: &configuration.CmdFanConfig{
 			GetRpm: &configuration.ExecConfig{
-				Exec: "/usr/bin/echo",
+				Exec: getEchoPath(),
 				Args: []string{"not_a_number"},
 			},
 		},
@@ -226,7 +233,7 @@ func TestCmdFan_GetRpmAvg(t *testing.T) {
 	config := configuration.FanConfig{
 		Cmd: &configuration.CmdFanConfig{
 			GetRpm: &configuration.ExecConfig{
-				Exec: "/usr/bin/echo",
+				Exec: getEchoPath(),
 				Args: []string{"1000"},
 			},
 		},
@@ -262,7 +269,7 @@ func TestCmdFan_GetPwm(t *testing.T) {
 	config := configuration.FanConfig{
 		Cmd: &configuration.CmdFanConfig{
 			GetPwm: &configuration.ExecConfig{
-				Exec: "/usr/bin/echo",
+				Exec: getEchoPath(),
 				Args: []string{"255"},
 			},
 		},
@@ -282,7 +289,7 @@ func TestCmdFan_SetPwm(t *testing.T) {
 	config := configuration.FanConfig{
 		Cmd: &configuration.CmdFanConfig{
 			SetPwm: &configuration.ExecConfig{
-				Exec: "/usr/bin/echo",
+				Exec: getEchoPath(),
 				Args: []string{"%pwm%"},
 			},
 		},
@@ -476,7 +483,7 @@ func TestCmdFan_Supports_RpmSensor_True(t *testing.T) {
 	config := configuration.FanConfig{
 		Cmd: &configuration.CmdFanConfig{
 			GetRpm: &configuration.ExecConfig{
-				Exec: "/usr/bin/echo",
+				Exec: getEchoPath(),
 				Args: []string{"1000"},
 			},
 		},