Skip to content
Permalink
Browse files
Merge branch 'cassandra-3.11' into cassandra-4.0
  • Loading branch information
bereng committed Jun 14, 2022
2 parents 2531dd1 + f884dda commit bb5b2d28896328df5996cb0fc870b012315f0e80
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
@@ -37,8 +37,8 @@

is_win = platform.system() == 'Windows'

unicode_controlchars_re = re.compile(r'[\x00-\x31\x7f-\xa0]')
controlchars_re = re.compile(r'[\x00-\x31\x7f-\xff]')
unicode_controlchars_re = re.compile(r'[\x00-\x1f\x7f-\xa0]')
controlchars_re = re.compile(r'[\x00-\x1f\x7f-\xff]')


def _show_control_chars(match):
@@ -22,6 +22,7 @@

from .basecase import BaseTestCase
from .cassconnect import (get_cassandra_connection, create_keyspace, testrun_cqlsh)
from cqlshlib.formatting import unicode_controlchars_re


class TestCqlshUnicode(BaseTestCase):
@@ -73,3 +74,6 @@ def test_unicode_desc(self): # CASSANDRA-16539
self.assertIn(v1, output)
output = c.cmd_and_response('DESC TYPE "%s";' %(v1,))
self.assertIn(v2, output)

def test_unicode_esc(self): # CASSANDRA-17617
self.assertFalse(unicode_controlchars_re.match("01"))

0 comments on commit bb5b2d2

Please sign in to comment.