From 611c4a006449f0629c07d867aa05363a8a0edcd0 Mon Sep 17 00:00:00 2001
From: snowman2 <alansnow21@gmail.com>
Date: Mon, 5 Dec 2022 21:58:38 -0600
Subject: [PATCH] CI: Add Network + Global Context test

---
 .github/workflows/test_proj_latest.yaml | 16 ++++++++++++----
 .github/workflows/tests.yaml            | 23 +++++++++++++++++++++++
 2 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/test_proj_latest.yaml b/.github/workflows/test_proj_latest.yaml
index b960ce438..37d08c725 100644
--- a/.github/workflows/test_proj_latest.yaml
+++ b/.github/workflows/test_proj_latest.yaml
@@ -46,24 +46,32 @@ jobs:
       - name: Test
         shell: bash
         run: |
-          py.test --cov-report term-missing --cov=pyproj --cov-report xml
+          python -m pytest --cov-report term-missing --cov=pyproj --cov-report xml
 
       - name: Test Network
         shell: bash
         env:
           PROJ_NETWORK: ON
         run: |
-          py.test
+          python -m pytest
 
       - name: Test Global Context
         shell: bash
         env:
           PYPROJ_GLOBAL_CONTEXT: ON
         run: |
-          py.test
+          python -m pytest
+
+      - name: Test Network & Global Context
+        shell: bash
+        env:
+          PROJ_NETWORK: ON
+          PYPROJ_GLOBAL_CONTEXT: ON
+        run: |
+          python -m pytest
 
       - name: Test Grids
         shell: bash
         run: |
           $PROJ_DIR/bin/projsync --quiet --bbox -175,0,-50,85
-          py.test
+          python -m pytest
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index b156f1de9..86dedacd0 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -96,6 +96,15 @@ jobs:
           . testenv/bin/activate
           python -m pytest
 
+      - name: Test Network & Global Context
+        shell: bash
+        env:
+          PROJ_NETWORK: ON
+          PYPROJ_GLOBAL_CONTEXT: ON
+        run: |
+          . testenv/bin/activate
+          python -m pytest
+
       - name: Test Grids
         shell: bash
         run: |
@@ -175,6 +184,8 @@ jobs:
       - name: Test
         shell: bash
         if: matrix.python-implementation == 'pypy'
+        env:
+          PROJ_NETWORK: OFF
         run: |
           source activate test
           python -m pytest
@@ -190,6 +201,16 @@ jobs:
       - name: Test Global Context
         shell: bash
         env:
+          PROJ_NETWORK: OFF
+          PYPROJ_GLOBAL_CONTEXT: ON
+        run: |
+          source activate test
+          python -m pytest
+
+      - name: Test Network & Global Context
+        shell: bash
+        env:
+          PROJ_NETWORK: ON
           PYPROJ_GLOBAL_CONTEXT: ON
         run: |
           source activate test
@@ -197,6 +218,8 @@ jobs:
 
       - name: Test Grids
         shell: bash
+        env:
+          PROJ_NETWORK: OFF
         run: |
           source activate test
           projsync --quiet --bbox -175,0,-50,85