Use public httpbin for mac runner in github actions.

Author: brunns

.github/workflows/ci.yml

@@ -139,14 +139,6 @@ jobs:
           node-version: ${{ matrix.node-version }}
       - name: Install build tools
         run: python3 -m pip install --upgrade pip setuptools wheel tox~=3.0
-      - name: Install and Start Colima
-        run: |
-          if [[ "${{ matrix.os }}" == *"macos"* ]]
-          then
-            brew install docker docker-compose
-            colima start
-          fi
-        shell: bash
       - name: Install mbtest ${{ matrix.mbtest-version }}
         env:
           MBTEST_VERSION: ${{ matrix.mbtest-version }}

setup.py

@@ -24,7 +24,7 @@
     "pyhamcrest>=2.0",
     "Deprecated>=1.2",
     "brunns-matchers>=2.4",
-    "imurl>=0.2",
+    "yarl>=1.9",
 ]
 test_dependencies = [
     "pytest>=6.0",

tests/integration/conftest.py

@@ -1,12 +1,15 @@
 # encoding=utf-8
-import sys
+import os
+import platform
 
 import pytest
-from imurl.url import URL
+from yarl import URL
 
 from mbtest import server
 
-WINDOWS = sys.platform.startswith("win")
+LOCAL = os.getenv("GITHUB_ACTIONS") != "true"
+LINUX = platform.system() == "Linux"
+HTTPBIN_CONTAINERISED = LINUX or LOCAL
 
 
 @pytest.fixture(scope="session")
@@ -16,10 +19,9 @@ def mock_server(request):
 
 @pytest.fixture(scope="session")
 def httpbin(docker_ip, docker_services) -> URL:
-    if WINDOWS:
-        # We can't run docker inside a Windows VM in GitHub Actions, so run tests against the public instance.
-        return URL("https://httpbin.org")
-    else:
+    if HTTPBIN_CONTAINERISED:
         docker_services.start("httpbin")
         port = docker_services.wait_for_service("httpbin", 80)
         return URL(f"http://{docker_ip}:{port}")
+    else:
+        return URL("https://httpbin.org")

tests/integration/test_proxy.py

@@ -1,5 +1,6 @@
 # encoding=utf-8
 import logging
+import os
 import platform
 
 import pytest
@@ -19,9 +20,12 @@
 logger = logging.getLogger(__name__)
 
 INTERNET_CONNECTED = internet_connection()
+LOCAL = os.getenv("GITHUB_ACTIONS") != "true"
+LINUX = platform.system() == "Linux"
+HTTPBIN_CONTAINERISED = LINUX or LOCAL
 
 
-@pytest.mark.xfail(platform.system() == "Windows", reason="Public httpbin horribly flaky.")
+@pytest.mark.xfail(not HTTPBIN_CONTAINERISED, reason="Public httpbin horribly flaky.")
 def test_proxy(mock_server, httpbin):
     imposter = Imposter(Stub(responses=Proxy(to=httpbin)))
 
@@ -34,7 +38,7 @@ def test_proxy(mock_server, httpbin):
         assert_that(imposter, had_request().with_path("/").and_method("GET"))
 
 
-@pytest.mark.xfail(platform.system() == "Windows", reason="Public httpbin horribly flaky.")
+@pytest.mark.xfail(not HTTPBIN_CONTAINERISED, reason="Public httpbin horribly flaky.")
 def test_stub_with_proxy_fallback(mock_server, httpbin):
     imposter = Imposter(
         stubs=[
@@ -54,7 +58,7 @@ def test_stub_with_proxy_fallback(mock_server, httpbin):
         assert_that(imposter, had_request().with_path("/").and_method("GET"))
 
 
-@pytest.mark.xfail(platform.system() == "Windows", reason="Public httpbin horribly flaky.")
+@pytest.mark.xfail(not HTTPBIN_CONTAINERISED, reason="Public httpbin horribly flaky.")
 def test_proxy_playback(mock_server, httpbin):
     proxy_imposter = Imposter(Stub(responses=Proxy(to=httpbin, mode=Proxy.Mode.ONCE)))
 
@@ -78,7 +82,7 @@ def test_proxy_playback(mock_server, httpbin):
         )
 
 
-@pytest.mark.xfail(platform.system() == "Windows", reason="Public httpbin horribly flaky.")
+@pytest.mark.xfail(not HTTPBIN_CONTAINERISED, reason="Public httpbin horribly flaky.")
 def test_proxy_uses_path_predicate_generator(mock_server, httpbin):
     proxy_imposter = Imposter(
         Stub(
@@ -110,7 +114,7 @@ def test_proxy_uses_path_predicate_generator(mock_server, httpbin):
         assert_that(response, is_response().with_status_code(200))
 
 
-@pytest.mark.xfail(platform.system() == "Windows", reason="Public httpbin horribly flaky.")
+@pytest.mark.xfail(not HTTPBIN_CONTAINERISED, reason="Public httpbin horribly flaky.")
 def test_proxy_uses_query_predicate_generator(mock_server, httpbin):
     proxy_imposter = Imposter(
         Stub(
@@ -150,7 +154,7 @@ def test_proxy_uses_query_predicate_generator(mock_server, httpbin):
         )
 
 
-@pytest.mark.xfail(platform.system() == "Windows", reason="Public httpbin horribly flaky.")
+@pytest.mark.xfail(not HTTPBIN_CONTAINERISED, reason="Public httpbin horribly flaky.")
 def test_proxy_uses_query_predicate_generator_with_key(mock_server, httpbin):
     proxy_imposter = Imposter(
         Stub(
@@ -200,7 +204,7 @@ def test_proxy_uses_query_predicate_generator_with_key(mock_server, httpbin):
         )
 
 
-@pytest.mark.xfail(platform.system() == "Windows", reason="Public httpbin horribly flaky.")
+@pytest.mark.xfail(not HTTPBIN_CONTAINERISED, reason="Public httpbin horribly flaky.")
 def test_proxy_without_stub(mock_server, httpbin):
     imposter = Imposter(Stub(responses=Proxy(to=httpbin)))
 
@@ -212,7 +216,7 @@ def test_proxy_without_stub(mock_server, httpbin):
         )
 
 
-@pytest.mark.xfail(platform.system() == "Windows", reason="Public httpbin horribly flaky.")
+@pytest.mark.xfail(not HTTPBIN_CONTAINERISED, reason="Public httpbin horribly flaky.")
 def test_proxy_delay(mock_server):
     target_imposter = Imposter(Stub(Predicate(path="/test")))
     with mock_server(target_imposter) as server:
@@ -225,7 +229,7 @@ def test_proxy_delay(mock_server):
             assert_that(timer.elapsed, between(0.1, 0.5))
 
 
-@pytest.mark.xfail(platform.system() == "Windows", reason="Public httpbin horribly flaky.")
+@pytest.mark.xfail(not HTTPBIN_CONTAINERISED, reason="Public httpbin horribly flaky.")
 def test_inject_headers(mock_server):
     target_imposter = Imposter(Stub(Predicate(path="/test")))
     with mock_server(target_imposter) as server:

tox.ini

@@ -12,8 +12,10 @@ allowlist_externals =
 extras =
     test
 commands =
-    {posargs:py.test} tests/unit/ tests/integration/
-passenv = *
+    {posargs:py.test} tests/unit/ tests/integration/ -o log_cli=true --keepalive
+passenv =
+    GITHUB_*
+    MBTEST_*
 usedevelop=True
 
 [testenv:coverage]