From 8dfdab1a98226f1533b91799855b1414dceebc76 Mon Sep 17 00:00:00 2001
From: hwipl <33433250+hwipl@users.noreply.github.com>
Date: Thu, 2 May 2024 18:18:13 +0200
Subject: [PATCH] Use t.Setenv() in vpncscript tests

Signed-off-by: hwipl <33433250+hwipl@users.noreply.github.com>
---
 internal/vpncscript/cmd_test.go | 16 ++++------------
 internal/vpncscript/env_test.go | 16 ++++------------
 2 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/internal/vpncscript/cmd_test.go b/internal/vpncscript/cmd_test.go
index d518830..57bb397 100644
--- a/internal/vpncscript/cmd_test.go
+++ b/internal/vpncscript/cmd_test.go
@@ -27,12 +27,8 @@ func TestRun(t *testing.T) {
 	// prepare environment with not existing sockfile
 	os.Clearenv()
 	sockfile := filepath.Join(t.TempDir(), "sockfile")
-	if err := os.Setenv("oc_daemon_socket_file", sockfile); err != nil {
-		t.Fatal(err)
-	}
-	if err := os.Setenv("oc_daemon_verbose", "true"); err != nil {
-		t.Fatal(err)
-	}
+	t.Setenv("oc_daemon_socket_file", sockfile)
+	t.Setenv("oc_daemon_verbose", "true")
 
 	// test with errors
 	for _, v := range []string{
@@ -40,9 +36,7 @@ func TestRun(t *testing.T) {
 		"disconnect",
 		"invalid",
 	} {
-		if err := os.Setenv("reason", v); err != nil {
-			t.Fatal(err)
-		}
+		t.Setenv("reason", v)
 		if err := run([]string{"test"}); err == nil {
 			t.Errorf("%s: should return error", v)
 		}
@@ -54,9 +48,7 @@ func TestRun(t *testing.T) {
 		"attempt-reconnect",
 		"reconnect",
 	} {
-		if err := os.Setenv("reason", v); err != nil {
-			t.Fatal(err)
-		}
+		t.Setenv("reason", v)
 		if err := run([]string{"test"}); err != nil {
 			t.Errorf("%s: should not return error, got: %v", v, err)
 		}
diff --git a/internal/vpncscript/env_test.go b/internal/vpncscript/env_test.go
index 542374f..f926c3d 100644
--- a/internal/vpncscript/env_test.go
+++ b/internal/vpncscript/env_test.go
@@ -24,9 +24,7 @@ func TestParseEnvironmentSplit(t *testing.T) {
 	}
 
 	// test with invalid number in variable
-	if err := os.Setenv("CISCO_SPLIT_EXC", "invalid"); err != nil {
-		t.Fatal(err)
-	}
+	t.Setenv("CISCO_SPLIT_EXC", "invalid")
 	want := []string{}
 	got := parseEnvironmentSplit("CISCO_SPLIT_EXC")
 	if !reflect.DeepEqual(got, want) {
@@ -34,9 +32,7 @@ func TestParseEnvironmentSplit(t *testing.T) {
 	}
 
 	// test with not matching numbers
-	if err := os.Setenv("CISCO_SPLIT_EXC", "1"); err != nil {
-		t.Fatal(err)
-	}
+	t.Setenv("CISCO_SPLIT_EXC", "1")
 	want = []string{}
 	got = parseEnvironmentSplit("CISCO_SPLIT_EXC")
 	if !reflect.DeepEqual(got, want) {
@@ -53,9 +49,7 @@ func TestParseEnvironmentSplit(t *testing.T) {
 		"CISCO_SPLIT_EXC_2_ADDR":    "10.0.0.0",
 		"CISCO_SPLIT_EXC_2_MASKLEN": "8",
 	} {
-		if err := os.Setenv(k, v); err != nil {
-			t.Fatal(err)
-		}
+		t.Setenv(k, v)
 	}
 
 	want = []string{
@@ -372,9 +366,7 @@ X-CSTP-Disable-Always-On-VPN=true`,
 		"oc_daemon_socket_file": "/run/oc-daemon/test.socket",
 		"oc_daemon_verbose":     "true",
 	} {
-		if err := os.Setenv(k, v); err != nil {
-			t.Fatal(err)
-		}
+		t.Setenv(k, v)
 	}
 
 	// print env