Run Windows tests on GitHub Actions

.github/workflows/ci.yml

@@ -0,0 +1,38 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  Windows:
+
+    runs-on: windows-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: [2.7, 3.5, 3.6, 3.7, 3.8]
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: Set up Python 3.7 to run nox
+      uses: actions/setup-python@v1
+      with:
+        python-version: 3.7
+    - name: Set up Python ${{ matrix.python-version }}
+      if: matrix.python_version != '3.7'
+      uses: actions/setup-python@v1
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install dependencies
+      run: |
+        # Work around https://github.com/theacodes/nox/issues/250
+        Remove-Item C:\ProgramData\Chocolatey\bin\python2.7.exe
+        py -3.7 -m pip install nox
+    - name: Test
+      run: |
+        nox -s test-${{ matrix.python-version }}
+    - name: Coverage upload
+      env:
+        CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+      run: |
+        python.exe -m pip install codecov
+        python.exe -m codecov

dev-requirements.txt

@@ -9,7 +9,7 @@ pytest-random-order==1.0.4;python_version>="3.6"
 pytest-timeout==1.3.3
 pytest-cov==2.7.1
 h11==0.8.0
-cryptography==2.6.1
+cryptography==2.8
 flaky==3.6.1
 
 # https://github.com/GoogleCloudPlatform/python-repo-tools/issues/23

noxfile.py

@@ -1,9 +1,21 @@
+from xml.etree import ElementTree as ET
 import os
+import re
 import shutil
+import sys
 
 import nox
 
 
+def _clean_coverage(coverage_path):
+    input_xml = ET.ElementTree(file=coverage_path)
+    for class_ in input_xml.findall(".//class"):
+        filename = class_.get("filename")
+        filename = re.sub("_sync", "_async", filename)
+        class_.set("filename", filename)
+    input_xml.write(coverage_path, xml_declaration=True)
+
+
 def tests_impl(session, extras="socks,secure,brotli"):
     # Install deps and the package itself.
     session.install("-r", "dev-requirements.txt")
@@ -28,7 +40,7 @@ def tests_impl(session, extras="socks,secure,brotli"):
         env={"PYTHONWARNINGS": "always::DeprecationWarning"}
     )
     session.run("coverage", "xml")
-    session.run("python", "cleancov.py", "coverage.xml")
+    _clean_coverage("coverage.xml")
 
 
 @nox.session(python=["2.7", "3.5", "3.6", "3.7", "3.8", "pypy"])

test/__init__.py

@@ -36,7 +36,7 @@
 # 3. To test our timeout logic by using two different values, eg. by using different
 #    values at the pool level and at the request level.
 SHORT_TIMEOUT = 0.001
-LONG_TIMEOUT = 0.5 if os.environ.get("CI") else 0.01
+LONG_TIMEOUT = 0.5 if os.environ.get("CI") or os.environ.get("GITHUB_ACTIONS") else 0.01
 
 
 def clear_warnings(cls=HTTPWarning):

test/conftest.py

@@ -1,5 +1,16 @@
+import platform
 import sys
 
+import pytest
+
 # We support Python 3.6+ for async code
 if sys.version_info[:2] < (3, 6):
     collect_ignore_glob = ["async/*.py", "with_dummyserver/async/*.py"]
+
+# The Python 3.8+ default loop on Windows breaks Tornado
+@pytest.fixture(scope="session", autouse=True)
+def configure_windows_event_loop():
+    if sys.version_info >= (3, 8) and platform.system() == "Windows":
+        import asyncio
+
+        asyncio.set_event_loop_policy(asyncio.WindowsSelectorEventLoopPolicy())

test/with_dummyserver/test_connectionpool.py

@@ -78,20 +78,13 @@ def test_conn_closed(self):
     def test_timeout(self):
         # Requests should time out when expected
         block_event = Event()
-        ready_event = self.start_basic_handler(block_send=block_event, num=6)
+        ready_event = self.start_basic_handler(block_send=block_event, num=3)
 
         # Pool-global timeout
-        timeout = Timeout(read=SHORT_TIMEOUT)
+        short_timeout = Timeout(read=SHORT_TIMEOUT)
         with HTTPConnectionPool(
-            self.host, self.port, timeout=timeout, retries=False
+            self.host, self.port, timeout=short_timeout, retries=False
         ) as pool:
-            wait_for_socket(ready_event)
-            conn = pool._get_conn()
-            with pytest.raises(ReadTimeoutError):
-                pool._make_request(conn, "GET", "/")
-            pool._put_conn(conn)
-            block_event.set()  # Release request
-
             wait_for_socket(ready_event)
             block_event.clear()
             with pytest.raises(ReadTimeoutError):
@@ -100,44 +93,24 @@ def test_timeout(self):
 
         # Request-specific timeouts should raise errors
         with HTTPConnectionPool(
-            self.host, self.port, timeout=LONG_TIMEOUT, retries=False
+            self.host, self.port, timeout=short_timeout, retries=False
         ) as pool:
-            conn = pool._get_conn()
-            wait_for_socket(ready_event)
-            now = time.time()
-            with pytest.raises(ReadTimeoutError):
-                pool._make_request(conn, "GET", "/", timeout=timeout)
-            delta = time.time() - now
-            block_event.set()  # Release request
-
-            message = "timeout was pool-level LONG_TIMEOUT rather than request-level SHORT_TIMEOUT"
-            assert delta < LONG_TIMEOUT, message
-            pool._put_conn(conn)
-
             wait_for_socket(ready_event)
             now = time.time()
             with pytest.raises(ReadTimeoutError):
-                pool.request("GET", "/", timeout=timeout)
+                pool.request("GET", "/", timeout=LONG_TIMEOUT)
             delta = time.time() - now
 
-            message = "timeout was pool-level LONG_TIMEOUT rather than request-level SHORT_TIMEOUT"
-            assert delta < LONG_TIMEOUT, message
+            message = "timeout was pool-level SHORT_TIMEOUT rather than request-level LONG_TIMEOUT"
+            assert delta >= LONG_TIMEOUT, message
             block_event.set()  # Release request
 
-            # Timeout int/float passed directly to request and _make_request should
-            # raise a request timeout
+            # Timeout passed directly to request should raise a request timeout
             wait_for_socket(ready_event)
             with pytest.raises(ReadTimeoutError):
                 pool.request("GET", "/", timeout=SHORT_TIMEOUT)
             block_event.set()  # Release request
 
-            wait_for_socket(ready_event)
-            conn = pool._new_conn()
-            # FIXME: This assert flakes sometimes. Not sure why.
-            with pytest.raises(ReadTimeoutError):
-                pool._make_request(conn, "GET", "/", timeout=SHORT_TIMEOUT)
-            block_event.set()  # Release request
-
     def test_connect_timeout(self):
         url = "/"
         host, port = TARPIT_HOST, 80

test/with_dummyserver/test_proxy_poolmanager.py

@@ -131,15 +131,13 @@ def test_cross_host_redirect(self):
                     "GET",
                     "%s/redirect" % self.http_url,
                     fields={"target": cross_host_location},
-                    timeout=LONG_TIMEOUT,
                     retries=0,
                 )
 
             r = http.request(
                 "GET",
                 "%s/redirect" % self.http_url,
                 fields={"target": "%s/echo?a=b" % self.http_url_alt},
-                timeout=LONG_TIMEOUT,
                 retries=1,
             )
             assert r._pool.host != self.http_host_alt
@@ -152,15 +150,13 @@ def test_cross_protocol_redirect(self):
                     "GET",
                     "%s/redirect" % self.http_url,
                     fields={"target": cross_protocol_location},
-                    timeout=LONG_TIMEOUT,
                     retries=0,
                 )
 
             r = http.request(
                 "GET",
                 "%s/redirect" % self.http_url,
                 fields={"target": "%s/echo?a=b" % self.https_url},
-                timeout=LONG_TIMEOUT,
                 retries=1,
             )
             assert r._pool.host == self.https_host