Skip to content

Commit 9ac038f

Browse files
authored
Merge pull request #147 from muzarski/cass_future_wait_timed
future: cass future wait timed
2 parents cb034e3 + e0beb15 commit 9ac038f

File tree

7 files changed

+305
-31
lines changed

7 files changed

+305
-31
lines changed

Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,8 @@ run-test-integration-scylla: build-integration-test-bin
188188
endif
189189
@echo "Running integration tests on scylla ${SCYLLA_VERSION}"
190190
valgrind --error-exitcode=123 --leak-check=full --errors-for-leak-kinds=definite build/cassandra-integration-tests --scylla --version=${SCYLLA_VERSION} --category=CASSANDRA --verbose=ccm --gtest_filter="${SCYLLA_TEST_FILTER}"
191+
@echo "Running timeout sensitive tests on scylla ${SCYLLA_VERSION}"
192+
build/cassandra-integration-tests --scylla --version=${SCYLLA_VERSION} --category=CASSANDRA --verbose=ccm --gtest_filter="AsyncTests.Integration_Cassandra_Simple"
191193

192194
run-test-integration-cassandra: prepare-integration-test download-ccm-cassandra-image install-java8-if-missing
193195
ifdef DONT_REBUILD_INTEGRATION_BIN
@@ -197,6 +199,8 @@ run-test-integration-cassandra: build-integration-test-bin
197199
endif
198200
@echo "Running integration tests on cassandra ${CASSANDRA_VERSION}"
199201
valgrind --error-exitcode=123 --leak-check=full --errors-for-leak-kinds=definite build/cassandra-integration-tests --version=${CASSANDRA_VERSION} --category=CASSANDRA --verbose=ccm --gtest_filter="${CASSANDRA_TEST_FILTER}"
202+
@echo "Running timeout sensitive tests on cassandra ${CASSANDRA_VERSION}"
203+
build/cassandra-integration-tests --version=${CASSANDRA_VERSION} --category=CASSANDRA --verbose=ccm --gtest_filter="AsyncTests.Integration_Cassandra_Simple"
200204

201205
run-test-unit: install-cargo-if-missing _update-rust-tooling
202206
@cd ${CURRENT_DIR}/scylla-rust-wrapper; cargo test

README.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -165,12 +165,9 @@ The driver inherits almost all the features of C/C++ and Rust drivers, such as:
165165
<tr>
166166
<td colspan=2 align="center" style="font-weight:bold">Future</td>
167167
</tr>
168-
<tr>
169-
<td>cass_future_wait_timed</td>
170-
<td rowspan="3">Unimplemented</td>
171-
</tr>
172168
<tr>
173169
<td>cass_future_coordinator</td>
170+
<td>Unimplemented</td>
174171
</tr>
175172
<tr>
176173
<td colspan=2 align="center" style="font-weight:bold">Collection</td>

scylla-rust-wrapper/Cargo.lock

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

scylla-rust-wrapper/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ openssl-sys = "0.9.75"
2525
openssl = "0.10.32"
2626
tracing-subscriber = { version = "0.3.15", features = ["env-filter"] }
2727
tracing = "0.1.37"
28+
futures = "0.3"
2829

2930
[build-dependencies]
3031
bindgen = "0.65"

0 commit comments

Comments
 (0)