Deselect offheap tests when they are marked as 'no_offheap_memtables' patch by jasobrown; reviewed by Jordan West for CASSANDRA-14542
Project: http://git-wip-us.apache.org/repos/asf/cassandra-dtest/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra-dtest/commit/b9d15561 Tree: http://git-wip-us.apache.org/repos/asf/cassandra-dtest/tree/b9d15561 Diff: http://git-wip-us.apache.org/repos/asf/cassandra-dtest/diff/b9d15561 Branch: refs/heads/master Commit: b9d15561512565ca58313c458701cc677f2f53b0 Parents: 3a338c7 Author: Jason Brown <jasedbr...@gmail.com> Authored: Sun Jun 24 15:14:42 2018 -0700 Committer: Jason Brown <jasedbr...@gmail.com> Committed: Thu Jul 26 10:31:08 2018 -0700 ---------------------------------------------------------------------- conftest.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra-dtest/blob/b9d15561/conftest.py ---------------------------------------------------------------------- diff --git a/conftest.py b/conftest.py index 84ece62..0040ec6 100644 --- a/conftest.py +++ b/conftest.py @@ -470,7 +470,9 @@ def pytest_collection_modifyitems(items, config): if not config.getoption("--execute-upgrade-tests"): deselect_test = True - # todo kjkj: deal with no_offheap_memtables mark + if item.get_marker("no_offheap_memtables"): + if config.getoption("use_off_heap_memtables"): + deselect_test = True if deselect_test: deselected_items.append(item) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
