Adding a matrix for token tests

esnet · Oct 25, 2023 · a36f35d · a36f35d
1 parent a4c6af8
commit a36f35d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -11,11 +11,15 @@ jobs:
   test:
     strategy:
       matrix:
+        include:
+          - token_test: 1
+          - token_test: 0
         go: [ 1.21.0 ]
-        grafana: [ 8.5.22, 9.4.3, 10.1.4 ]
+        grafana: [ 9.4.3, 10.1.4 ]
 
-    env:
+    environment:
       GRAFANA_INTEGRATION: 1
+      TEST_TOKEN_CONFIG: "${{ matrix.token_test }}"
 
     runs-on: ubuntu-latest
     steps:
@@ -27,7 +31,6 @@ jobs:
 
       - name: Verify go version
         run: go version
-
       - uses: actions/cache@v3
         with:
           path: |
@@ -36,6 +39,9 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-go-
 
+      - name: Verify ENV
+        run: |
+          echo "cfg: $TEST_TOKEN_CONFIG context: $GDG_CONTEXT_NAME"
       - name: Calc coverage
         if: "${{ matrix.go == '1.21.0' && matrix.grafana == '10.1.4' }}"
         run: |

diff --git a/test/common_test.go b/test/common_test.go
@@ -117,9 +117,8 @@ func TestMain(m *testing.M) {
 }
 
 func initTest(t *testing.T, cfgName *string) (service.GrafanaService, *viper.Viper) {
-	//os.Setenv("GDG_CONTEXT_NAME", "testing")
 	apiClient, v := createSimpleClient(t, cfgName)
-	//temp
+
 	if os.Getenv("TEST_TOKEN_CONFIG") != "1" {
 		return apiClient, v
 	}