Merge pull request #85 from grafana/fix-unit-tests-on-macos

Fix unit tests on macos
grafana · Dec 7, 2022 · 18af6ef · 18af6ef
2 parents ef4c5a7 + 4c4dd1e
commit 18af6ef
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 14 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -12,7 +12,10 @@ on:
 
 jobs:
   build-with-xk6:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest]
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
@@ -26,7 +29,10 @@ jobs:
           xk6 build --with $(go list -m)=.
 
   run-unit-tests:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest]
     steps:
       - name: Checkout code
         uses: actions/checkout@v3

diff --git a/pkg/utils/process/fake_test.go b/pkg/utils/process/fake_test.go
@@ -24,13 +24,13 @@ func Test_FakeExecutor(t *testing.T) {
 		},
 		{
 			title:   "command without arguments",
-			cmdLine: "/bin/true",
+			cmdLine: "true",
 			out:     []byte{},
 			err:     nil,
 		},
 		{
 			title:   "command returning error",
-			cmdLine: "/bin/false",
+			cmdLine: "false",
 			out:     []byte{},
 			err:     fmt.Errorf("command exited with rc 1"),
 		},
@@ -157,13 +157,13 @@ func Test_Callbacks(t *testing.T) {
 		},
 		{
 			title:   "command without arguments",
-			cmdLine: "/bin/true",
+			cmdLine: "true",
 			out:     []byte{},
 			err:     nil,
 		},
 		{
 			title:   "command returning error",
-			cmdLine: "/bin/false",
+			cmdLine: "false",
 			out:     []byte{},
 			err:     fmt.Errorf("command exited with rc 1"),
 		},

diff --git a/pkg/utils/process/process_test.go b/pkg/utils/process/process_test.go
@@ -23,29 +23,29 @@ func Test_Exec(t *testing.T) {
 		},
 		{
 			title:        "return stderr",
-			cmd:          "/bin/bash",
-			args:         []string{"-c", "echo -n 'hello world' 2>&1"},
+			cmd:          "sh",
+			args:         []string{"-c", "echo hello world 2>&1"},
 			expectError:  false,
-			expectOutput: "hello world",
+			expectOutput: "hello world\n",
 		},
 		{
 			title:        "do not return output",
-			cmd:          "/bin/true",
+			cmd:          "true",
 			expectError:  false,
 			expectOutput: "",
 		},
 		{
 			title:        "command return error code",
-			cmd:          "/bin/false",
+			cmd:          "false",
 			expectError:  true,
 			expectOutput: "",
 		},
 		{
 			title:        "return error code and stderr",
-			cmd:          "/bin/bash",
-			args:         []string{"-c", "echo -n 'hello world' 2>&1; kill -KILL $$"},
+			cmd:          "sh",
+			args:         []string{"-c", "echo hello world 2>&1; kill -KILL $$"},
 			expectError:  true,
-			expectOutput: "hello world",
+			expectOutput: "hello world\n",
 		},
 	}