Use pytest.mark.xfail

instead of unittest.expectedFailure. The former has a `reason` argument,
and this reason is shown in test report - so it's easier to judge wheter
the test should really fail.

Author: Lorak-mmk

tests/integration/standard/test_metadata.py

@@ -23,6 +23,7 @@
 import os
 from packaging.version import Version
 from mock import Mock, patch
+import pytest
 
 from cassandra import AlreadyExists, SignatureDescriptor, UserFunctionDescriptor, UserAggregateDescriptor
 
@@ -1209,7 +1210,7 @@ def test_export_keyspace_schema_udts(self):
         cluster.shutdown()
 
     @greaterthancass21
-    @unittest.expectedFailure
+    @pytest.mark.xfail(reason='Column name in CREATE INDEX is not quoted. It\'s a bug in driver or in Scylla')
     def test_case_sensitivity(self):
         """
         Test that names that need to be escaped in CREATE statements are
@@ -1279,7 +1280,7 @@ def test_already_exists_exceptions(self):
         cluster.shutdown()
 
     @local
-    @unittest.expectedFailure
+    @pytest.mark.xfail(reason='AssertionError: \'RAC1\' != \'r1\' - probably a bug in driver or in Scylla')
     def test_replicas(self):
         """
         Ensure cluster.metadata.get_replicas return correctly when not attached to keyspace

tests/integration/standard/test_query.py

@@ -17,6 +17,7 @@
 
 import unittest
 import logging
+import pytest
 from cassandra import ProtocolVersion
 from cassandra import ConsistencyLevel, Unavailable, InvalidRequest, cluster
 from cassandra.query import (PreparedStatement, BoundStatement, SimpleStatement,
@@ -1036,8 +1037,7 @@ def test_empty_batch_statement(self):
         with self.assertRaises(RuntimeError):
             results.was_applied
 
-    # Skipping until PYTHON-943 is resolved
-    @unittest.expectedFailure
+    @pytest.mark.xfail(reason='Skipping until PYTHON-943 is resolved')
     def test_was_applied_batch_string(self):
         batch_statement = BatchStatement(BatchType.LOGGED)
         batch_statement.add_all(["INSERT INTO test3rf.lwt_clustering (k, c, v) VALUES (0, 0, 10);",