generate keyspace names internally instead of abusing tempfile

Patch by Adam Holmberg; reviewed by brandonwilliams for CASSANDRA-16639
This commit is contained in:
Adam Holmberg 2021-04-28 14:33:09 -05:00 committed by Brandon Williams
parent 10a1d65eb0
commit 132c01e570
2 changed files with 32 additions and 19 deletions

View File

@ -18,6 +18,8 @@
import contextlib
import io
import os.path
import random
import string
import tempfile
from .basecase import TEST_HOST, TEST_PORT, cql, cqlsh, cqlshlog, policy, quote_name, rundir
@ -39,9 +41,19 @@ TEST_KEYSPACES_CREATED = []
def get_keyspace():
return None if len(TEST_KEYSPACES_CREATED) == 0 else TEST_KEYSPACES_CREATED[-1]
_used_ks_names = set()
def make_ks_name():
# abuse mktemp to get a quick random-ish name
return os.path.basename(tempfile.mktemp(prefix='CqlshTests_'))
def random_ks():
return 'cqlshtests_' + ''.join(random.choice(string.ascii_lowercase) for _ in range(10))
s = random_ks()
while s in _used_ks_names:
s = random_ks()
_used_ks_names.add(s)
return s
def create_keyspace(cursor):
ksname = make_ks_name().lower()

View File

@ -805,23 +805,24 @@ class TestCqlshCompletion(CqlshCompletionCase):
'aggmax'],
other_choices_ok=True)
def test_complete_in_drop_columnfamily(self):
pass
def test_complete_in_truncate(self):
pass
def test_complete_in_alter_columnfamily(self):
pass
def test_complete_in_use(self):
pass
def test_complete_in_create_index(self):
pass
def test_complete_in_drop_index(self):
pass
# TODO: CASSANDRA-16640
# def test_complete_in_drop_columnfamily(self):
# pass
#
# def test_complete_in_truncate(self):
# pass
#
# def test_complete_in_alter_columnfamily(self):
# pass
#
# def test_complete_in_use(self):
# pass
#
# def test_complete_in_create_index(self):
# pass
#
# def test_complete_in_drop_index(self):
# pass
def test_complete_in_alter_keyspace(self):
self.trycompletions('ALTER KEY', 'SPACE ')