github ci fix

mediacloud · Dec 14, 2023 · b5ac8b5 · b5ac8b5
1 parent 90f29f9
commit b5ac8b5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/mcnews/searchapi.py b/mcnews/searchapi.py
@@ -4,15 +4,11 @@
 import requests
 import ciso8601
 from mcnews import util
-import os
-import pytest
 
-VERSION = "v1"  # the API access URL is versioned for future compatability and maintenance
 
+VERSION = "v1"  # the API access URL is versioned for future compatability and maintenance
 
-IN_GITHUB_CI_WORKFLOW = os.getenv("GITHUB_ACTIONS") == "true"
 
-pytest.mark.skipif(IN_GITHUB_CI_WORKFLOW, reason="requires VPN tunnel to Media Cloud")
 class SearchApiClient:
 
     API_BASE_URL = "https://news-search-api.tarbell.mediacloud.org/{}/".format(VERSION)

diff --git a/mcnews/tests/test_fixtures.py b/mcnews/tests/test_fixtures.py
@@ -1,12 +1,15 @@
 from unittest import TestCase
 import datetime as dt
-
+import os
+import pytest
 import mcnews.searchapi as searchapi
 
 INTEGRATION_TEST_COLLECTION = "mediacloud_test"
 INTEGRATION_TEST_HOST = "http://127.0.0.1:8000"
 
+IN_GITHUB_CI_WORKFLOW = os.getenv("GITHUB_ACTIONS") == "true"
 
+pytest.mark.skipif(IN_GITHUB_CI_WORKFLOW, reason="requires VPN tunnel to Media Cloud")
 class TestMediaCloudCollection(TestCase):
 
     def setUp(self) -> None:

diff --git a/mcnews/tests/test_waybacknews.py b/mcnews/tests/test_waybacknews.py
@@ -2,12 +2,16 @@
 import datetime as dt
 import ciso8601
 import requests
+import os
+import pytest
 
 from mcnews.searchapi import SearchApiClient
 
 COLLECTION_MEDIACLOUD = "mediacloud"
 
+IN_GITHUB_CI_WORKFLOW = os.getenv("GITHUB_ACTIONS") == "true"
 
+pytest.mark.skipif(IN_GITHUB_CI_WORKFLOW, reason="requires VPN tunnel to Media Cloud")
 class TestMediaCloudCollection(TestCase):
 
     def setUp(self) -> None: