commit 2a721e7b058025f42f8b86c8a2ecd851c2790f00
author Tomek Lasica <tomasz.lasica@datastax.com> Tue Jan 26 16:29:20 2021 +0100
committer Mick Semb Wever <mck@apache.org> Fri Jan 29 13:40:42 2021 +0100
tree 7d4552916df4a26981f5105ab00eb55fb23a9ad9
parent ec84618b7450ef9357a3a88fc93e39d74a34b02e

Handle NodeError as it may be raised from ccm

patch by Tomek Łasica; reviewed by Mick Semb Wever for CASSANDRA-16405

commitlog_test.py

diff --git a/commitlog_test.py b/commitlog_test.py
index b0c769f..6ff11cd 100644
--- a/commitlog_test.py
+++ b/commitlog_test.py
@@ -11,7 +11,7 @@
 from cassandra import WriteTimeout
 from cassandra.cluster import NoHostAvailable, OperationTimedOut
 from ccmlib.common import is_win
-from ccmlib.node import Node, TimeoutError
+from ccmlib.node import Node, TimeoutError, NodeError
 from parse import parse
 
 from dtest import Tester, create_ks
@@ -43,16 +43,14 @@
         # so this changes them back so we can delete them.
         self._change_commitlog_perms(stat.S_IWRITE | stat.S_IREAD | stat.S_IEXEC)
 
-
     def prepare(self, configuration=None, create_test_keyspace=True, **kwargs):
         if configuration is None:
             configuration = {}
         default_conf = {'commitlog_sync_period_in_ms': 1000}
 
         set_conf = dict(default_conf, **configuration)
-        logger.debug('setting commitlog configuration with the following values: '
-              '{set_conf} and the following kwargs: {kwargs}'.format(
-                  set_conf=set_conf, kwargs=kwargs))
+        logger.debug('setting commitlog configuration with the following values: {set_conf}'
+                     ' and the following kwargs: {kwargs}'.format(set_conf=set_conf, kwargs=kwargs))
         self.cluster.set_configuration_options(values=set_conf, **kwargs)
         self.cluster.start()
         self.session1 = self.patient_cql_connection(self.node1)
@@ -76,10 +74,10 @@
 
             if commitlogs:
                 logger.debug('changing permissions to {perms} on the following files:'
-                      '\n  {files}'.format(perms=oct(mod), files='\n  '.join(commitlogs)))
+                             '\n  {files}'.format(perms=oct(mod), files='\n  '.join(commitlogs)))
             else:
                 logger.debug(self._change_commitlog_perms.__name__ + ' called on empty commitlog directory '
-                      '{path} with permissions {perms}'.format(path=path, perms=oct(mod)))
+                                                                     '{path} with permissions {perms}'.format(path=path, perms=oct(mod)))
 
             for commitlog in commitlogs:
                 os.chmod(commitlog, mod)
@@ -503,7 +501,7 @@
         mark = node.mark_log()
         node.start()
         node.watch_log_for(expected_error, from_mark=mark)
-        with pytest.raises(TimeoutError):
+        with pytest.raises((TimeoutError, NodeError)):
             node.wait_for_binary_interface(from_mark=mark, timeout=20)
         assert not node.is_running()
 
@@ -620,10 +618,10 @@
                 # "Changed in version 2.6: The return value is in the range [-2**31, 2**31-1] regardless
                 # of platform. In the past the value would be signed on some platforms and unsigned on
                 # others. Use & 0xffffffff on the value if you want it to match Python 3 behavior."
-                assert (crc & 0xffffffff)  == get_header_crc(header_bytes)
+                assert (crc & 0xffffffff) == get_header_crc(header_bytes)
 
         mark = node.mark_log()
         node.start()
         node.watch_log_for(expected_error, from_mark=mark)
-        with pytest.raises(TimeoutError):
+        with pytest.raises((TimeoutError, NodeError)):
             node.wait_for_binary_interface(from_mark=mark, timeout=20)