Add verbose output tests and fix py2 tests

gabor-boros · gabor-boros · commit 93c0301f96f4 · 2018-12-13T22:40:47.000+01:00
diff --git a/Makefile b/Makefile
@@ -49,10 +49,10 @@ help:
 	@echo "	make publish			Publish ${PACKAGE_NAME} package on PyPi"
 
 test-unit:
-	pytest -m unit
+	pytest -v -m unit
 
 test-integration:
-	pytest -m integration
+	pytest -v -m integration
 
 test-remote: prepare
 	python ${REMOTE_TEST_SETUP_NAME} pytest -m integration
diff --git a/tests/test_handshake.py b/tests/test_handshake.py
@@ -198,7 +198,10 @@ def test_prepare_auth_request(self):
         self.handshake._random_nonce = base64.encodebytes(b'random_nonce') if six.PY3 else base64.b64encode(b'random_nonce')
         self.handshake._first_client_message = chain_to_bytes('n=', self.handshake._username, ',r=', self.handshake._random_nonce)
         response = {'success': True, 'authentication': 's=cmFuZG9tX25vbmNl\n,i=2,r=cmFuZG9tX25vbmNl\n'}
-        expected_result = b'{"authentication": "c=biws,r=cmFuZG9tX25vbmNl\\n,p=2Tpd60LM4Tkhe7VATTPj/lh4yunl07Sm4A+m3ukC774="}\x00'
+        if six.PY3:
+            expected_result = b'{"authentication": "c=biws,r=cmFuZG9tX25vbmNl\\n,p=2Tpd60LM4Tkhe7VATTPj/lh4yunl07Sm4A+m3ukC774="}\x00'
+        else:
+            expected_result = b'{"authentication": "c=biws,r=cmFuZG9tX25vbmNl\\n,p=JqVP98bzu3yye/3SLopNJvCRimBx34uKI/EY8UI41gM="}\x00'
 
         result = self.handshake._prepare_auth_request(json.dumps(response))
 
