Skip to content

Commit 69191ac

Browse files
committed
test_tablets: stop using unittest
Unittest interfere into pytest ordering, which will be needed in next commit
1 parent 347f332 commit 69191ac

File tree

1 file changed

+11
-15
lines changed

1 file changed

+11
-15
lines changed

tests/integration/experiments/test_tablets.py

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
import time
2-
import unittest
3-
import pytest
4-
import os
51
from cassandra.cluster import Cluster
62
from cassandra.policies import ConstantReconnectionPolicy, RoundRobinPolicy, TokenAwarePolicy
73

@@ -11,7 +7,7 @@
117
def setup_module():
128
use_cluster('tablets', [3], start=True)
139

14-
class TestTabletsIntegration(unittest.TestCase):
10+
class TestTabletsIntegration:
1511
@classmethod
1612
def setup_class(cls):
1713
cls.cluster = Cluster(contact_points=["127.0.0.1", "127.0.0.2", "127.0.0.3"], protocol_version=PROTOCOL_VERSION,
@@ -33,8 +29,8 @@ def verify_same_host_in_tracing(self, results):
3329
LOGGER.info("TRACE EVENT: %s %s %s", event.source, event.thread_name, event.description)
3430
host_set.add(event.source)
3531

36-
self.assertEqual(len(host_set), 1)
37-
self.assertIn('locally', "\n".join([event.description for event in events]))
32+
assert len(host_set) == 1
33+
assert 'locally' in "\n".join([event.description for event in events])
3834

3935
trace_id = results.response_future.get_query_trace_ids()[0]
4036
traces = self.session.execute("SELECT * FROM system_traces.events WHERE session_id = %s", (trace_id,))
@@ -44,8 +40,8 @@ def verify_same_host_in_tracing(self, results):
4440
LOGGER.info("TRACE EVENT: %s %s", event.source, event.activity)
4541
host_set.add(event.source)
4642

47-
self.assertEqual(len(host_set), 1)
48-
self.assertIn('locally', "\n".join([event.activity for event in events]))
43+
assert len(host_set) == 1
44+
assert 'locally' in "\n".join([event.activity for event in events])
4945

5046
def verify_same_shard_in_tracing(self, results):
5147
traces = results.get_query_trace()
@@ -55,8 +51,8 @@ def verify_same_shard_in_tracing(self, results):
5551
LOGGER.info("TRACE EVENT: %s %s %s", event.source, event.thread_name, event.description)
5652
shard_set.add(event.thread_name)
5753

58-
self.assertEqual(len(shard_set), 1)
59-
self.assertIn('locally', "\n".join([event.description for event in events]))
54+
assert len(shard_set) == 1
55+
assert 'locally' in "\n".join([event.description for event in events])
6056

6157
trace_id = results.response_future.get_query_trace_ids()[0]
6258
traces = self.session.execute("SELECT * FROM system_traces.events WHERE session_id = %s", (trace_id,))
@@ -66,8 +62,8 @@ def verify_same_shard_in_tracing(self, results):
6662
LOGGER.info("TRACE EVENT: %s %s", event.thread, event.activity)
6763
shard_set.add(event.thread)
6864

69-
self.assertEqual(len(shard_set), 1)
70-
self.assertIn('locally', "\n".join([event.activity for event in events]))
65+
assert len(shard_set) == 1
66+
assert 'locally' in "\n".join([event.activity for event in events])
7167

7268
def create_ks_and_cf(self):
7369
self.session.execute(
@@ -110,7 +106,7 @@ def query_data_shard_select(self, session, verify_in_tracing=True):
110106

111107
bound = prepared.bind([(2)])
112108
results = session.execute(bound, trace=True)
113-
self.assertEqual(results, [(2, 2, 0)])
109+
assert results == [(2, 2, 0)]
114110
if verify_in_tracing:
115111
self.verify_same_shard_in_tracing(results)
116112

@@ -122,7 +118,7 @@ def query_data_host_select(self, session, verify_in_tracing=True):
122118

123119
bound = prepared.bind([(2)])
124120
results = session.execute(bound, trace=True)
125-
self.assertEqual(results, [(2, 2, 0)])
121+
assert results == [(2, 2, 0)]
126122
if verify_in_tracing:
127123
self.verify_same_host_in_tracing(results)
128124

0 commit comments

Comments
 (0)