Skip to content

Commit 379f6a3

Browse files
committed
Fixing timing, dependency and CL issues in tests.
1 parent a001257 commit 379f6a3

5 files changed

Lines changed: 24 additions & 11 deletions

File tree

build.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ build:
1919
export JAVA_HOME=$CCM_JAVA_HOME
2020
export PATH=$JAVA_HOME/bin:$PATH
2121
22-
sudo python /home/jenkins/ccm/setup.py install
2322
# Install dependencies
2423
if [[ $EVENT_LOOP_MANAGER == 'libev' ]]; then
2524
sudo apt-get install -y libev4 libev-dev

test-requirements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
-r requirements.txt
2-
blist
32
scales
43
nose
54
mock<=1.0.1

tests/integration/cqlengine/query/test_named.py

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
except ImportError:
1818
import unittest # noqa
1919

20-
from cassandra.cqlengine import operators, connection
20+
from cassandra import ConsistencyLevel
21+
from cassandra.cqlengine import operators
2122
from cassandra.cqlengine.named import NamedKeyspace
2223
from cassandra.cqlengine.operators import EqualsOperator, GreaterThanOrEqualOperator
2324
from cassandra.cqlengine.query import ResultObject
@@ -343,20 +344,17 @@ def test_named_table_with_mv(self):
343344
('jbellis', 'Checkers', 2015, 6, 20, 1200),
344345
('jbellis', 'Chess', 2015, 6, 21, 3500),
345346
('pcmanus', 'Chess', 2015, 1, 25, 3200)}
347+
prepared_insert.consistency_level = ConsistencyLevel.ALL
346348
execute_concurrent_with_args(self.session, prepared_insert, parameters)
347349

348350
# Attempt to query the data using Named Table interface
349351
# Also test filtering on mv's
350352
key_space = NamedKeyspace(ks)
351-
table = key_space.table("scores")
352353
mv_monthly = key_space.table("monthlyhigh")
353-
table_objects = table.objects.all()
354-
mv_monthly_objects = mv_monthly.objects.all()
355354
mv_all_time = key_space.table("alltimehigh")
356-
mv_all_objects = mv_all_time.objects.all()
357-
self.assertEqual(len(table_objects), len(parameters))
358-
self.assertEqual(len(mv_monthly_objects), len(parameters))
359-
self.assertEqual(len(mv_all_objects), len(parameters))
355+
self.assertTrue(self.check_table_size("scores", key_space, len(parameters)))
356+
self.assertTrue(self.check_table_size("monthlyhigh", key_space, len(parameters)))
357+
self.assertTrue(self.check_table_size("alltimehigh", key_space, len(parameters)))
360358

361359
filtered_mv_monthly_objects = mv_monthly.objects.filter(game='Chess', year=2015, month=6)
362360
self.assertEqual(len(filtered_mv_monthly_objects), 1)
@@ -365,3 +363,16 @@ def test_named_table_with_mv(self):
365363
filtered_mv_alltime_objects = mv_all_time.objects.filter(game='Chess')
366364
self.assertEqual(len(filtered_mv_alltime_objects), 2)
367365
self.assertEqual(filtered_mv_alltime_objects[0]['score'], 3500)
366+
367+
def check_table_size(self, table_name, key_space, expected_size):
368+
table = key_space.table(table_name)
369+
attempts = 0
370+
while attempts < 10:
371+
attempts += 1
372+
table_size = len(table.objects.all())
373+
if(table_size is not expected_size):
374+
print("Table {0} size was {1} and was expected to be {2}".format(table_name, table_size, expected_size))
375+
else:
376+
return True
377+
378+
return False

tests/integration/standard/test_prepared_statements.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import unittest # noqa
2222
from cassandra import InvalidRequest
2323

24+
from cassandra import ConsistencyLevel
2425
from cassandra.cluster import Cluster
2526
from cassandra.query import PreparedStatement, UNSET_VALUE
2627
from tests.integration import get_server_versions
@@ -275,6 +276,7 @@ def test_no_meta(self):
275276

276277
self.assertIsInstance(prepared, PreparedStatement)
277278
bound = prepared.bind(None)
279+
bound.consistency_level = ConsistencyLevel.ALL
278280
self.session.execute(bound)
279281

280282
prepared = self.session.prepare(
@@ -284,6 +286,7 @@ def test_no_meta(self):
284286
self.assertIsInstance(prepared, PreparedStatement)
285287

286288
bound = prepared.bind(None)
289+
bound.consistency_level = ConsistencyLevel.ALL
287290
results = self.session.execute(bound)
288291
self.assertEqual(results[0].v, 0)
289292

tests/integration/standard/test_query.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,8 @@ def test_incomplete_query_trace(self):
162162
trace = response_future._query_traces[0]
163163

164164
# Delete trace duration from the session (this is what the driver polls for "complete")
165-
self.session.execute("DELETE duration FROM system_traces.sessions WHERE session_id = %s", (trace.trace_id,))
165+
delete_statement = SimpleStatement("DELETE duration FROM system_traces.sessions WHERE session_id = {}".format(trace.trace_id), consistency_level=ConsistencyLevel.ALL)
166+
self.session.execute(delete_statement)
166167

167168
# should raise because duration is not set
168169
self.assertRaises(TraceUnavailable, trace.populate, max_wait=0.2, wait_for_complete=True)

0 commit comments

Comments
 (0)