Merge branch 'test_macos' into test_windows

Author: altendky

.github/workflows/ci.yml

@@ -32,7 +32,6 @@ jobs:
         os:
           - name: Linux
             runs-on: ubuntu-latest
-            python_platform: linux
             matrix: linux
             container:
               2.7: docker://python:2.7-buster
@@ -42,17 +41,15 @@ jobs:
               3.9: docker://python:3.9-buster
               pypy2: docker://pypy:2-jessie
               pypy3: docker://pypy:3-stretch
+          - name: macOS
+            runs-on: macos-latest
+            matrix: macos
           - name: Windows
             runs-on: windows-latest
-            python_platform: win32
             matrix: windows
             openssl:
               x86: win32
               x64: win64
-#          - name: macOS
-#            runs-on: macos-latest
-#            python_platform: darwin
-#            matrix: macos
         python:
           - name: CPython 2.7
             tox: py27
@@ -165,6 +162,13 @@ jobs:
           echo "INCLUDE=$PYPY_EXTERNALS_PATH/include;$INCLUDE" >> $GITHUB_ENV
           echo "LIB=$PYPY_EXTERNALS_PATH/lib;$LIB" >> $GITHUB_ENV
 #          echo "CL=${{ matrix.PYTHON.CL_FLAGS }}" >> $GITHUB_ENV
+      - name: Add Brew
+        if: ${{ matrix.os.matrix == 'macos' && matrix.python.implementation == 'pypy'}}
+        shell: bash
+        run: |
+          brew install openssl@1.1 rust
+          echo "LDFLAGS=-L$(brew --prefix openssl@1.1)/lib" >> $GITHUB_ENV
+          echo "CFLAGS=-I$(brew --prefix openssl@1.1)/include" >> $GITHUB_ENV
       - name: rustup
         if: ${{ matrix.os.matrix == 'windows' && matrix.python.implementation == 'pypy'}}
         shell: bash
@@ -206,7 +210,6 @@ jobs:
         os:
           - name: Linux
             runs-on: ubuntu-latest
-            python_platform: linux
             matrix: linux
             container:
               3.8: docker://python:3.8-buster
@@ -240,6 +243,7 @@ jobs:
     # Should match JOB_NAME below
     name: ${{ matrix.task.name }} - ${{ matrix.os.name }} ${{ matrix.python.name }} ${{ matrix.arch.name }}
     runs-on: ${{ matrix.os.runs-on }}
+    if: always()
     needs:
       - test
     container: ${{ matrix.os.container[matrix.python.docker] }}
@@ -253,7 +257,6 @@ jobs:
         os:
           - name: Linux
             runs-on: ubuntu-latest
-            python_platform: linux
             matrix: linux
             container:
               3.8: docker://python:3.8-buster

test/test_client_async.py

@@ -237,7 +237,7 @@ def handle_failure(failure):
     def testSerialTornadoClient(self, method, framer):
         """ Test the serial tornado client client initialize """
         from serial import Serial
-        with maybe_manage(sys.platform == 'win32', patch.object(Serial, "open")):
+        with maybe_manage(sys.platform in ('darwin', 'win32'), patch.object(Serial, "open")):
             protocol, future = AsyncModbusSerialClient(schedulers.IO_LOOP, method=method, port=SERIAL_PORT)
             client = future.result()
             assert(isinstance(client, AsyncTornadoModbusSerialClient))