From 9eba8289fc61e25291daea64540c40f0a0b4fe67 Mon Sep 17 00:00:00 2001
From: Marcus Eriksson <marcuse@apache.org>
Date: Thu, 31 May 2018 08:41:11 +0200
Subject: [PATCH] always enable tombstone validation exceptions during tests

---
 dtest_setup.py | 2 ++
 ttl_test.py    | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/dtest_setup.py b/dtest_setup.py
index 295fa3f5bf..9e3f33031d 100644
--- a/dtest_setup.py
+++ b/dtest_setup.py
@@ -417,6 +417,8 @@ def init_default_config(self):
         # No more thrift in 4.0, and start_rpc doesn't exists anymore
         if self.cluster.version() >= '4' and 'start_rpc' in values:
             del values['start_rpc']
+        if self.cluster.version() >= '4':
+            values['corrupted_tombstone_strategy'] = 'exception'
 
         self.cluster.set_configuration_options(values)
         logger.debug("Done setting configuration options:\n" + pprint.pformat(self.cluster._config_options, indent=4))
diff --git a/ttl_test.py b/ttl_test.py
index 4a7ad060b9..d89ca6aa75 100644
--- a/ttl_test.py
+++ b/ttl_test.py
@@ -567,6 +567,8 @@ def test_recover_negative_expiration_date_sstables_with_scrub(self):
         Check that row with negative overflowed ttl is recovered by offline scrub
         """
         cluster = self.cluster
+        if self.cluster.version() >= '4':
+            cluster.set_configuration_options(values={'corrupted_tombstone_strategy': 'disabled'})
         cluster.populate(1).start(wait_for_binary_proto=True)
         [node] = cluster.nodelist()