Improve CI reliability

.github/workflows/ci.yml

@@ -84,14 +84,9 @@ jobs:
         run: |
           nox -s test-${{ matrix.python-version }}
       - name: Upload Coverage
-        uses: codecov/codecov-action@v1
-        with:
-          token: 3bb38a90-137e-4efe-9627-ca66de472c13
-          file: ./coverage.xml
-          flags: unittests
-          name: codecov-umbrella
-          yml: ./codecov.yml
-          fail_ci_if_error: true
+        run: ./_travis/upload_coverage.sh
+        env:
+          JOB_NAME: 'macOS (${{ matrix.python-version }})'
 
   Windows:
     runs-on: windows-latest
@@ -122,11 +117,7 @@ jobs:
         run: |
           nox -s test-${{ matrix.python-version }}
       - name: Upload Coverage
-        uses: codecov/codecov-action@v1
-        with:
-          token: 3bb38a90-137e-4efe-9627-ca66de472c13
-          file: ./coverage.xml
-          flags: unittests
-          name: codecov-umbrella
-          yml: ./codecov.yml
-          fail_ci_if_error: true
+        run: ./_travis/upload_coverage.sh
+        shell: bash
+        env:
+          JOB_NAME: 'Windows (${{ matrix.python-version }})'

_travis/upload_coverage.sh

@@ -2,7 +2,20 @@
 
 set -exo pipefail
 
-if [[ -e .coverage ]]; then
-    python -m pip install codecov
-    python -m codecov --env TRAVIS_OS_NAME,NOX_SESSION
+# Cribbed from Trio's ci.sh
+function curl-harder() {
+    for BACKOFF in 0 1 2 4 8 15 15 15 15; do
+        sleep $BACKOFF
+        if curl -fL --connect-timeout 5 "$@"; then
+            return 0
+        fi
+    done
+    return 1
+}
+
+if [ "$JOB_NAME" = "" ]; then
+    JOB_NAME="${TRAVIS_OS_NAME}-${TRAVIS_PYTHON_VERSION:-unknown}"
 fi
+
+curl-harder -o codecov.sh https://codecov.io/bash
+bash codecov.sh -f coverage.xml -n "${JOB_NAME}"

dev-requirements.txt

@@ -1,5 +1,5 @@
 mock==3.0.5
-coverage~=4.5
+coverage~=5.1
 tornado==5.1.1
 PySocks==1.7.1
 # https://github.com/Anorov/PySocks/issues/131

test/__init__.py

@@ -105,6 +105,19 @@ def wrapper(*args, **kwargs):
     return wrapper
 
 
+def skipPyPy3(test):
+    """Skips this test on PyPy3"""
+
+    @six.wraps(test)
+    def wrapper(*args, **kwargs):
+        if platform.python_implementation() == "PyPy" and sys.version_info[0] == 3:
+            msg = "{} hangs on PyPy3".format(test.__name__)
+            pytest.skip(msg)
+        return test(*args, **kwargs)
+
+    return wrapper
+
+
 def onlyBrotlipy():
     return pytest.mark.skipif(brotli is None, reason="only run if brotlipy is present")
 

test/with_dummyserver/test_socketlevel.py

@@ -17,6 +17,7 @@
 from hip.util.retry import Retry
 from hip._collections import HTTPHeaderDict
 
+from test import skipPyPy3
 from dummyserver.testcase import SocketDummyServerTestCase, consume_socket
 from dummyserver.server import (
     DEFAULT_CERTS,
@@ -1287,6 +1288,7 @@ def socket_handler(listener):
             finally:
                 timed_out.set()
 
+    @skipPyPy3
     def test_ssl_failed_fingerprint_verification(self):
         def socket_handler(listener):
             for i in range(2):