Support option serial tests

Author: pjkundert

.github/workflows/main.yml

@@ -32,7 +32,8 @@ jobs:
       run: |
         python3 -m pip install --upgrade pip
         python3 -m pip install wheel
-        if [ -f requirements.txt ]; then python3 -m pip install -r requirements.txt; fi
+        python3 -m pip install -r requirements.txt
+        python3 -m pip install -r requirements-serial.txt
         python3 -m pip install flake8 pytest
     - name: Lint with flake8
       run: |

GNUmakefile

@@ -75,7 +75,11 @@ dist/SLIP39.app: SLIP39.py FORCE
 #   o advance __version__ number in slip32/version.py
 #   o log in to your pypi account (ie. for package maintainer only)
 
-upload: 	wheel
+upload-check:
+	@$(PY3) -m twine --version \
+	    || ( echo "\n*** Missing Python modules; run:\n\n        $(PY3) -m pip install --upgrade twine\n" \
+	        && false )
+upload: 	upload-check wheel
 	python3 -m twine upload --repository pypi dist/slip39-$(VERSION)*
 
 clean:

slip39/generator_test.py

@@ -3,7 +3,12 @@
 import pty
 import threading
 
-from serial		import Serial
+import pytest
+
+try:
+    from serial		import Serial
+except ImportError:
+    Serial			= None
 
 from .api		import RANDOM_BYTES, accountgroups
 from .generator		import chacha20poly1305, accountgroups_output, accountgroups_input
@@ -25,6 +30,8 @@ def listener(port):
             os.write(port, b"I don't understand\r\n")
 
 
+@pytest.mark.skipif( not Serial,
+                     reason="Serial testing needs pyserial" )
 def test_serial():
     """Start the testing"""
     master,slave = pty.openpty()		# open the pseudoterminal
@@ -77,20 +84,8 @@ def generator( password, cryptopaths, fd ):
         )
 
 
-class SerialEOF( Serial ):
-    """Convert any SerialException to an EOFError, for compatibility with PTY.  In real serial ports,
-    we'll handle detection of counterparty readiness with DTR/DSR, and flow control with RTS/CTS."""
-    def read( self, size=1 ):
-        while True:
-            try:
-                return super( SerialEOF, self ).read( size=size )
-            except Exception as exc:  # SerialError as exc:
-                # if "readiness" in str(exc):
-                #     time.sleep( .1 )
-                #     continue
-                raise EOFError( str( exc ))
-
-
+@pytest.mark.skipif( not Serial,
+                     reason="Serial testing needs pyserial" )
 def test_groups_pty():
     password			= "password"
     master,slave		= pty.openpty()
@@ -107,6 +102,22 @@ def test_groups_pty():
     gen.daemon			= True
     gen.start()
 
+    class SerialEOF( Serial ):
+        """Convert any SerialException to an EOFError, for compatibility with PTY.  In real serial
+        ports, we'll handle detection of counterparty readiness with DTR/DSR, and flow control with
+        RTS/CTS.
+
+        """
+        def read( self, size=1 ):
+            while True:
+                try:
+                    return super( SerialEOF, self ).read( size=size )
+                except Exception as exc:  # SerialError as exc:
+                    # if "readiness" in str(exc):
+                    #     time.sleep( .1 )
+                    #     continue
+                    raise EOFError( str( exc ))
+
     ser				= SerialEOF( slave_name, timeout=1)
     for group in accountgroups_input(
         cipher		= chacha20poly1305( password=password ),