assert_query_count_equals: Use pytest.fail

Author: Lorak-mmk

tests/integration/long/test_consistency.py

@@ -101,9 +101,9 @@ def _assert_reads_succeed(self, session, keyspace, consistency_levels, expected_
                 self._query(session, keyspace, 1, cl)
                 for i in range(3):
                     if i == expected_reader:
-                        self.coordinator_stats.assert_query_count_equals(self, i, 1)
+                        self.coordinator_stats.assert_query_count_equals(i, 1)
                     else:
-                        self.coordinator_stats.assert_query_count_equals(self, i, 0)
+                        self.coordinator_stats.assert_query_count_equals(i, 0)
             except Exception as e:
                 self._cl_failure(cl, e)
 
@@ -136,9 +136,9 @@ def _test_tokenaware_one_node_down(self, keyspace, rf, accepted):
         create_schema(cluster, session, keyspace, replication_factor=rf)
         self._insert(session, keyspace, count=1)
         self._query(session, keyspace, count=1)
-        self.coordinator_stats.assert_query_count_equals(self, 1, 0)
-        self.coordinator_stats.assert_query_count_equals(self, 2, 1)
-        self.coordinator_stats.assert_query_count_equals(self, 3, 0)
+        self.coordinator_stats.assert_query_count_equals(1, 0)
+        self.coordinator_stats.assert_query_count_equals(2, 1)
+        self.coordinator_stats.assert_query_count_equals(3, 0)
 
         try:
             force_stop(2)
@@ -188,9 +188,9 @@ def test_rfthree_tokenaware_none_down(self):
         create_schema(cluster, session, keyspace, replication_factor=3)
         self._insert(session, keyspace, count=1)
         self._query(session, keyspace, count=1)
-        self.coordinator_stats.assert_query_count_equals(self, 1, 0)
-        self.coordinator_stats.assert_query_count_equals(self, 2, 1)
-        self.coordinator_stats.assert_query_count_equals(self, 3, 0)
+        self.coordinator_stats.assert_query_count_equals(1, 0)
+        self.coordinator_stats.assert_query_count_equals(2, 1)
+        self.coordinator_stats.assert_query_count_equals(3, 0)
 
         self.coordinator_stats.reset_counts()
 
@@ -211,9 +211,9 @@ def _test_downgrading_cl(self, keyspace, rf, accepted):
         create_schema(cluster, session, keyspace, replication_factor=rf)
         self._insert(session, keyspace, 1)
         self._query(session, keyspace, 1)
-        self.coordinator_stats.assert_query_count_equals(self, 1, 0)
-        self.coordinator_stats.assert_query_count_equals(self, 2, 1)
-        self.coordinator_stats.assert_query_count_equals(self, 3, 0)
+        self.coordinator_stats.assert_query_count_equals(1, 0)
+        self.coordinator_stats.assert_query_count_equals(2, 1)
+        self.coordinator_stats.assert_query_count_equals(3, 0)
 
         try:
             force_stop(2)
@@ -268,13 +268,13 @@ def rfthree_downgradingcl(self, cluster, keyspace, roundrobin):
         self._query(session, keyspace, count=12)
 
         if roundrobin:
-            self.coordinator_stats.assert_query_count_equals(self, 1, 4)
-            self.coordinator_stats.assert_query_count_equals(self, 2, 4)
-            self.coordinator_stats.assert_query_count_equals(self, 3, 4)
+            self.coordinator_stats.assert_query_count_equals(1, 4)
+            self.coordinator_stats.assert_query_count_equals(2, 4)
+            self.coordinator_stats.assert_query_count_equals(3, 4)
         else:
-            self.coordinator_stats.assert_query_count_equals(self, 1, 0)
-            self.coordinator_stats.assert_query_count_equals(self, 2, 12)
-            self.coordinator_stats.assert_query_count_equals(self, 3, 0)
+            self.coordinator_stats.assert_query_count_equals(1, 0)
+            self.coordinator_stats.assert_query_count_equals(2, 12)
+            self.coordinator_stats.assert_query_count_equals(3, 0)
 
         try:
             self.coordinator_stats.reset_counts()
@@ -288,13 +288,13 @@ def rfthree_downgradingcl(self, cluster, keyspace, roundrobin):
                 self.coordinator_stats.reset_counts()
                 self._query(session, keyspace, 12, consistency_level=cl)
                 if roundrobin:
-                    self.coordinator_stats.assert_query_count_equals(self, 1, 6)
-                    self.coordinator_stats.assert_query_count_equals(self, 2, 0)
-                    self.coordinator_stats.assert_query_count_equals(self, 3, 6)
+                    self.coordinator_stats.assert_query_count_equals(1, 6)
+                    self.coordinator_stats.assert_query_count_equals(2, 0)
+                    self.coordinator_stats.assert_query_count_equals(3, 6)
                 else:
-                    self.coordinator_stats.assert_query_count_equals(self, 1, 0)
-                    self.coordinator_stats.assert_query_count_equals(self, 2, 0)
-                    self.coordinator_stats.assert_query_count_equals(self, 3, 12)
+                    self.coordinator_stats.assert_query_count_equals(1, 0)
+                    self.coordinator_stats.assert_query_count_equals(2, 0)
+                    self.coordinator_stats.assert_query_count_equals(3, 12)
         finally:
             start(2)
             wait_for_up(cluster, 2)