Skip to content
Permalink
Browse files
Merge pull request #1383 from pauloricardomg/12903
Add bootstrap test with SSL (CASSANDRA-12903)
  • Loading branch information
pauloricardomg committed Dec 5, 2016
2 parents 4031157 + c7f164d commit 87cf9b53b60925fae450e7a5b95fce6b2082df0a
Showing 1 changed file with 13 additions and 1 deletion.
@@ -17,6 +17,7 @@
from tools.decorators import no_vnodes, since
from tools.intervention import InterruptBootstrap, KillOnBootstrap
from tools.misc import ImmutableMapping, new_node
from tools.misc import generate_ssl_stores


class BaseBootstrapTest(Tester):
@@ -34,7 +35,8 @@ class BaseBootstrapTest(Tester):
r'Streaming error occurred'
)

def _base_bootstrap_test(self, bootstrap=None, bootstrap_from_version=None):
def _base_bootstrap_test(self, bootstrap=None, bootstrap_from_version=None,
enable_ssl=None):
def default_bootstrap(cluster, token):
node2 = new_node(cluster)
node2.set_configuration_options(values={'initial_token': token})
@@ -45,6 +47,12 @@ def default_bootstrap(cluster, token):
bootstrap = default_bootstrap

cluster = self.cluster

if enable_ssl:
debug("***using internode ssl***")
generate_ssl_stores(self.test_path)
cluster.enable_internode_ssl(self.test_path)

tokens = cluster.balanced_tokens(2)
cluster.set_configuration_options(values={'num_tokens': 1})

@@ -108,6 +116,10 @@ def default_bootstrap(cluster, token):
class TestBootstrap(BaseBootstrapTest):
__test__ = True

@no_vnodes()
def simple_bootstrap_test_with_ssl(self):
self._base_bootstrap_test(enable_ssl=True)

@no_vnodes()
def simple_bootstrap_test(self):
self._base_bootstrap_test()

0 comments on commit 87cf9b5

Please sign in to comment.