Actually skip tests and not just fail them

keybar · Mar 19, 2016 · e6567a9 · e6567a9
1 parent 43a843a
commit e6567a9
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/keybar/tests/test_client.py b/src/keybar/tests/test_client.py
@@ -79,7 +79,7 @@ def test_to_server_without_tls_10(self, allow_offline):
         response = session.get('https://tls1test.salesforce.com/s/')
         assert response.status_code == 200
 
-    @pytest.mark.xfail
+    @pytest.mark.skip(reason='intermediate failure')
     def test_under_downgrade_attack_to_ssl_3(self, allow_offline):
         """
         Verify that the connection is rejected if the remote server (or man
@@ -96,15 +96,15 @@ def test_protocols_by_ssl_labs(self, allow_offline):
 
         assert 'Your user agent has good protocol support' in response.text
 
-    @pytest.mark.xfail(os.environ.get('ON_TRAVIS', None) == 'true', reason='on travis')
+    @pytest.mark.skipif(os.environ.get('ON_TRAVIS', None) == 'true', reason='on travis')
     def test_sni_suport(self, allow_offline):
         session = requests.Session()
         session.mount('https://', TLS12SSLAdapter())
         response = session.get('https://sni.velox.ch/')
         assert 'sent the following TLS server name indication extension' in response.text
         assert 'negotiated protocol: TLSv1.2' in response.text
 
-    @pytest.mark.xfail(os.environ.get('ON_TRAVIS', None) == 'true', reason='on travis')
+    @pytest.mark.skipif(os.environ.get('ON_TRAVIS', None) == 'true', reason='on travis')
     def test_vulnerability_logjam_by_ssl_labs(self, allow_offline):
         assert verify_rejected_ssl('https://www.ssllabs.com:10445/')