travis unittests: add more test cases

.travis.yml

@@ -13,12 +13,15 @@ matrix:
     - os: linux
       python: 3.6
     - os: linux
-      python: 3.7-dev
+      python: 3.7
+    - os: linux
+      python: 3.8
     - os: osx
       language: generic
       env: PYTHON_BIN=python2
 
 script:
   - $PYTHON_BIN setup.py install
   - cd ..
-  - $PYTHON_BIN -m sslpsk.test
+  - # $PYTHON_BIN -m sslpsk.test
+  - $PYTHON_BIN sslpsk/sslpsk/test/test_sslpsk.py -v -b

sslpsk/sslpsk.py

@@ -86,11 +86,8 @@ def wrap_socket(*args, **kwargs):
     do_handshake_on_connect = kwargs.get('do_handshake_on_connect', True)
     kwargs['do_handshake_on_connect'] = False
 
-    psk = kwargs.setdefault('psk', None)
-    del kwargs['psk']
-
-    hint = kwargs.setdefault('hint', None)
-    del kwargs['hint']
+    psk = kwargs.pop('psk', None)
+    hint = kwargs.pop('hint', None)
 
     server_side = kwargs.setdefault('server_side', False)
     if psk:

sslpsk/test/__init__.py

@@ -19,4 +19,5 @@ def tests():
     return unittest.TestLoader().discover(os.path.dirname(__file__))
 
 def run():
-    unittest.TextTestRunner(verbosity=1).run(tests())
+    return unittest.TextTestRunner(verbosity=1).run(tests())
+

sslpsk/test/__main__.py

@@ -12,6 +12,8 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License
 
+import sys
 import sslpsk.test
 
-sslpsk.test.run()
+result = sslpsk.test.run()
+sys.exit(not result.wasSuccessful())

sslpsk/test/example_client.py

@@ -3,8 +3,10 @@
 import ssl
 import sslpsk
 
-PSKS = {'server1' : b'abcdef',
-        'server2' : b'uvwxyz'}
+PSKS = {
+    b'server1' : b'abcdef',
+    b'server2' : b'uvwxyz',
+}
 
 def client(host, port, psk):
     tcp_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)

sslpsk/test/example_server.py

@@ -3,8 +3,10 @@
 import ssl
 import sslpsk
 
-PSKS = {'client1' : b'abcdef',
-        'client2' : b'123456'}
+PSKS = {
+        b'client1' : b'abcdef',
+        b'client2' : b'123456',
+    }
 
 def server(host, port):
     tcp_sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)