(cassandra-dtest) branch trunk updated: ninja-fix – tmp avoid current_5_0_x (LooseVersion cant do `5.0-rc1 > 5.0.1` comparisons)
This is an automated email from the ASF dual-hosted git repository. mck pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git The following commit(s) were added to refs/heads/trunk by this push: new 2b17c129 ninja-fix – tmp avoid current_5_0_x (LooseVersion cant do `5.0-rc1 > 5.0.1` comparisons) 2b17c129 is described below commit 2b17c1293056068bb3e94c332d6fb99df6a0b0fa Author: Mick Semb Wever AuthorDate: Sat Jul 20 22:34:16 2024 +0200 ninja-fix – tmp avoid current_5_0_x (LooseVersion cant do `5.0-rc1 > 5.0.1` comparisons) ref: https://the-asf.slack.com/archives/CK23JSY2K/p1721508701444629 --- upgrade_tests/upgrade_manifest.py | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/upgrade_tests/upgrade_manifest.py b/upgrade_tests/upgrade_manifest.py index 4bacfe6a..66066c95 100644 --- a/upgrade_tests/upgrade_manifest.py +++ b/upgrade_tests/upgrade_manifest.py @@ -175,9 +175,11 @@ indev_4_1_x = VersionMeta(name='indev_4_1_x', family=CASSANDRA_4_1, variant='ind current_4_1_x = VersionMeta(name='current_4_1_x', family=CASSANDRA_4_1, variant='current', version='4.1.5', min_proto_v=4, max_proto_v=5, java_versions=(8,11)) indev_5_0_x = VersionMeta(name='indev_5_0_x', family=CASSANDRA_5_0, variant='indev', version='github:apache/cassandra-5.0', min_proto_v=4, max_proto_v=5, java_versions=(11,17)) -current_5_0_x = VersionMeta(name='current_5_0_x', family=CASSANDRA_5_0, variant='current', version='5.0-rc1', min_proto_v=4, max_proto_v=5, java_versions=(11,17)) +# TODO – uncomment current_5_0_x further down when 5.0.0 is released +current_5_0_x = VersionMeta(name='current_5_0_x', family=CASSANDRA_5_0, variant='current', version='5.0.0', min_proto_v=4, max_proto_v=5, java_versions=(11,17)) indev_trunk = VersionMeta(name='indev_trunk', family=TRUNK, variant='indev', version='github:apache/trunk', min_proto_v=4, max_proto_v=5, java_versions=(11,17)) +# TODO – add current_5_1_x when this gets uncommented (when 5.1-alpha1 is released) # current_5_1_x = VersionMeta(name='current_5_1_x', family=CASSANDRA_5_1, variant='current', version='5.1-alpha1', min_proto_v=4, max_proto_v=5, java_versions=(11,17)) @@ -196,7 +198,9 @@ MANIFEST = { current_3_11_x: [indev_3_11_x, indev_4_0_x, indev_4_1_x], current_4_0_x: [indev_4_0_x, indev_4_1_x, indev_5_0_x, indev_trunk], current_4_1_x: [indev_4_1_x, indev_5_0_x, indev_trunk], -current_5_0_x: [indev_5_0_x, indev_trunk], +# TODO – uncomment when 5.0.0 is released +# LooseVersion cant do 5.0-rc1 comparisons +#current_5_0_x: [indev_5_0_x, indev_trunk], indev_2_1_x: [indev_2_2_x, indev_3_0_x, indev_3_11_x], indev_2_2_x: [indev_3_0_x, indev_3_11_x], - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra-dtest) branch trunk updated: Ninja fix: test_pkey_requirement, revert empty lines removal from cql output, CASSANDRA-19341
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git The following commit(s) were added to refs/heads/trunk by this push: new 1f81e1c9 Ninja fix: test_pkey_requirement, revert empty lines removal from cql output, CASSANDRA-19341 1f81e1c9 is described below commit 1f81e1c9b98c7b444098daf721415dc8599bffdd Author: Ekaterina Dimitrova AuthorDate: Tue May 7 09:39:37 2024 -0400 Ninja fix: test_pkey_requirement, revert empty lines removal from cql output, CASSANDRA-19341 --- json_test.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/json_test.py b/json_test.py index 94c09f55..69b8b5a5 100644 --- a/json_test.py +++ b/json_test.py @@ -1242,6 +1242,7 @@ class TestJsonFullRowInsertSelect(Tester): def test_pkey_requirement(self): """ Create schema: + >>> cqlsh(''' ... CREATE TABLE primitive_type_test ( ... key1 text PRIMARY KEY, @@ -1261,7 +1262,9 @@ class TestJsonFullRowInsertSelect(Tester): ... col14 varint, ... col15 boolean) ... ''') + Try to create a JSON row with the pkey omitted from the column list, and omitted from the JSON data: + >>> cqlsh_err_print('''INSERT INTO primitive_type_test JSON '{"col1": "bar"}' ''') :2:InvalidRequest: Error from server: code=2200 [Invalid query] message="Invalid null value in condition for column key1" - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra-dtest] branch trunk updated: ninja-fix – correct name for .asf.yaml
This is an automated email from the ASF dual-hosted git repository. mck pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git The following commit(s) were added to refs/heads/trunk by this push: new 54f5a98 ninja-fix – correct name for .asf.yaml 54f5a98 is described below commit 54f5a983738a1580fbbe43bdb7201ff9b2664401 Author: Mick Semb Wever AuthorDate: Sun Mar 20 11:55:21 2022 +0100 ninja-fix – correct name for .asf.yaml --- .asf.yaml | 5 + 1 file changed, 5 insertions(+) diff --git a/.asf.yaml b/.asf.yaml new file mode 100644 index 000..a4ec7f7 --- /dev/null +++ b/.asf.yaml @@ -0,0 +1,5 @@ +github: + enabled_merge_buttons: +squash: false +merge: false +rebase: true - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra-dtest] branch trunk updated: ninja-fix – correct name for .asf.yaml
This is an automated email from the ASF dual-hosted git repository. mck pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git The following commit(s) were added to refs/heads/trunk by this push: new 196e021 ninja-fix – correct name for .asf.yaml 196e021 is described below commit 196e0213cdeff8410c8ea8516b9ac0782a0e6f2f Author: Mick Semb Wever AuthorDate: Sun Mar 20 11:53:13 2022 +0100 ninja-fix – correct name for .asf.yaml --- .asf.yml | 5 - 1 file changed, 5 deletions(-) diff --git a/.asf.yml b/.asf.yml deleted file mode 100644 index a4ec7f7..000 --- a/.asf.yml +++ /dev/null @@ -1,5 +0,0 @@ -github: - enabled_merge_buttons: -squash: false -merge: false -rebase: true - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra-dtest] branch trunk updated: ninja fix
This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git The following commit(s) were added to refs/heads/trunk by this push: new 517cb17 ninja fix 517cb17 is described below commit 517cb17bc6c114ca3a9d3ab9c25efaf364e81550 Author: Ekaterina Dimitrova AuthorDate: Sun Feb 6 00:25:19 2022 -0500 ninja fix --- requirements.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index cbf6ec5..d7c396a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,8 +9,7 @@ # # In case you want to test a patch with your own CCM branch, further to changing below CCM repo and branch name, you need to add -e flag at the beginning # Example: -e git+https://github.com/userb/ccm.git@cassandra-17182#egg=ccm -# git+https://github.com/riptano/ccm.git@cassandra-test#egg=ccm --e git+https://github.com/ekaterinadimitrova2/ccm.git@CASSANDRA-15234-3#egg=ccm +git+https://github.com/riptano/ccm.git@cassandra-test#egg=ccm decorator docopt enum34 - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra-dtest] branch trunk updated: ninja: fix version checks in TestNetworkAuth
This is an automated email from the ASF dual-hosted git repository. samt pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git The following commit(s) were added to refs/heads/trunk by this push: new 573573d ninja: fix version checks in TestNetworkAuth 573573d is described below commit 573573d92d5c5b8716a0673444fafd36b3d83de2 Author: Sam Tunnicliffe AuthorDate: Mon Sep 6 19:45:36 2021 +0100 ninja: fix version checks in TestNetworkAuth Follow up to CASSANDRA-16404 --- auth_test.py | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/auth_test.py b/auth_test.py index bd46688..a85bca5 100644 --- a/auth_test.py +++ b/auth_test.py @@ -3114,7 +3114,7 @@ class TestNetworkAuth(Tester): self.clear_network_auth_cache(self.dc2_node, cache_name) self.assertUnauthorized(lambda: session.execute("SELECT * FROM ks.tbl")) -if self.dtest_config.cassandra_version_from_build > '4.0': +if self.dtest_config.cassandra_version_from_build >= '4.1': test_revoked_access("NetworkPermissionsCache") # deprecated cache name, scheduled for removal in 5.0 @@ -3155,7 +3155,10 @@ class TestNetworkAuth(Tester): session = self.exclusive_cql_connection(self.dc2_node, user=username, password='password') superuser.execute("ALTER ROLE %s WITH LOGIN=false" % username) self.clear_roles_cache(self.dc2_node) -self.clear_network_auth_cache(self.dc2_node) + +cache_name = "NetworkPermissionsCache" if self.dtest_config.cassandra_version_from_build >= '4.1' else "NetworkAuthCache" +self.clear_network_auth_cache(self.dc2_node, cache_name) + self.assertUnauthorized(lambda: session.execute("SELECT * FROM ks.tbl")) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra-dtest] branch trunk updated: Ninja fix all occurences of non-existent self.fail to pytest.fail
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git The following commit(s) were added to refs/heads/trunk by this push: new bca1834 Ninja fix all occurences of non-existent self.fail to pytest.fail bca1834 is described below commit bca1834dc7075ced5ebaeda15afcf691bcd30ab1 Author: Brandon Williams AuthorDate: Thu Jun 24 16:44:08 2021 -0500 Ninja fix all occurences of non-existent self.fail to pytest.fail --- auth_test.py | 8 cdc_test.py| 2 +- cfid_test.py | 3 ++- compaction_test.py | 2 +- cqlsh_tests/test_cqlsh.py | 2 +- materialized_views_test.py | 6 +++--- mixed_version_test.py | 6 +++--- native_transport_ssl_test.py | 4 ++-- nodetool_test.py | 2 +- paging_test.py | 4 ++-- pushed_notifications_test.py | 4 ++-- secondary_indexes_test.py | 6 +++--- ttl_test.py| 2 +- upgrade_tests/cql_tests.py | 2 +- upgrade_tests/drop_compact_storage_upgrade_test.py | 2 +- upgrade_tests/upgrade_through_versions_test.py | 2 +- 16 files changed, 29 insertions(+), 28 deletions(-) diff --git a/auth_test.py b/auth_test.py index 6d92ff5..df57fb0 100644 --- a/auth_test.py +++ b/auth_test.py @@ -845,7 +845,7 @@ class TestAuth(Tester): def check_caching(attempt=0): attempt += 1 if attempt > 3: -self.fail("Unable to verify cache expiry in 3 attempts, failing") +pytest.fail("Unable to verify cache expiry in 3 attempts, failing") logger.debug("Attempting to verify cache expiry, attempt #{i}".format(i=attempt)) # grant SELECT to cathy @@ -866,7 +866,7 @@ class TestAuth(Tester): check_caching(attempt) else: # legit failure -self.fail("Expecting query to raise an exception, but nothing was raised.") +pytest.fail("Expecting query to raise an exception, but nothing was raised.") except Unauthorized as e: assert re.search("User cathy has no SELECT permission on or any of its parents", str(e)) @@ -2742,7 +2742,7 @@ class TestAuthUnavailable(Tester): try: self.patient_exclusive_cql_connection(node0, timeout=2, user='cassandra', password='cassandra') -self.fail("Expected login attempt to raise an exception.") +pytest.fail("Expected login attempt to raise an exception.") except NoHostAvailable as e: # From driver assert isinstance(list(e.errors.values())[0], AuthenticationFailed) @@ -2781,7 +2781,7 @@ class TestAuthUnavailable(Tester): try: self.patient_exclusive_cql_connection(node0, timeout=2, user='cassandra', password='cassandra') -self.fail("Expected login attempt to raise an exception.") +pytest.fail("Expected login attempt to raise an exception.") except NoHostAvailable as e: # From driver assert isinstance(list(e.errors.values())[0], AuthenticationFailed) diff --git a/cdc_test.py b/cdc_test.py index 1dbe1fc..79166a9 100644 --- a/cdc_test.py +++ b/cdc_test.py @@ -530,7 +530,7 @@ class TestCDC(Tester): print('Set Two:') for idx_two in rd_two: print(' {},{},{},{}'.format(idx_two.name, idx_two.completed, idx_two.offset, idx_two.log_name)) -self.fail(msg) +pytest.fail(msg) def _init_new_loading_node(self, ks_name, create_stmt, use_thrift=False): loading_node = Node( diff --git a/cfid_test.py b/cfid_test.py index 3ad53e8..ec0a6d6 100644 --- a/cfid_test.py +++ b/cfid_test.py @@ -1,5 +1,6 @@ import os import logging +import pytest from dtest import Tester, create_ks, create_cf @@ -31,7 +32,7 @@ class TestCFID(Tester): try: cfs = os.listdir(node1.get_path() + "/data0/ks") except OSError: -self.fail("Path to sstables not valid.") +pytest.fail("Path to sstables not valid.") # check that there are 5 unique directories assert len(cfs) == 5 diff --git a/compaction_test.py b/compaction_test.py index d84b5dc..55fa016 100644 --- a/compaction_test.py +++ b/compaction_test.py @@ -189,7 +189,7 @@ class TestCompaction(Tester): assert not "Data" in afile, afile except OSError: -self.fail("Path to sstables not valid.") +pytest.fail("Path t
[cassandra-dtest] branch trunk updated: ninja fix six >=1.12.0
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git The following commit(s) were added to refs/heads/trunk by this push: new 363ebdb ninja fix six >=1.12.0 363ebdb is described below commit 363ebdbb644253c2ab142066b609910bfc07510e Author: Brandon Williams AuthorDate: Wed May 26 16:51:39 2021 -0500 ninja fix six >=1.12.0 --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index 9754239..375cada 100644 --- a/requirements.txt +++ b/requirements.txt @@ -18,6 +18,7 @@ pytest-repeat parse pycodestyle psutil +six>=1.12.0 thrift==0.10.0 netifaces beautifulsoup4 - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra-dtest] branch trunk updated: ninja-fix: in boot_strap.py TestBootstrap::_monitor_datadir, variable sstables needs to be defined first (CASSANDRA-15997)
This is an automated email from the ASF dual-hosted git repository. mck pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git The following commit(s) were added to refs/heads/trunk by this push: new 2c0cc2a ninja-fix: in boot_strap.py TestBootstrap::_monitor_datadir, variable sstables needs to be defined first (CASSANDRA-15997) 2c0cc2a is described below commit 2c0cc2ae2cdbf83508ecf374ec7a995e7ba0d6b3 Author: Mick Semb Wever AuthorDate: Wed Nov 25 20:58:23 2020 +0100 ninja-fix: in boot_strap.py TestBootstrap::_monitor_datadir, variable sstables needs to be defined first (CASSANDRA-15997) --- bootstrap_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap_test.py b/bootstrap_test.py index 51ee32e..3db8eab 100644 --- a/bootstrap_test.py +++ b/bootstrap_test.py @@ -827,8 +827,8 @@ class TestBootstrap(Tester): def _monitor_datadir(self, node, event, basecount, jobs, failed): while True: +sstables = [s for s in node.get_sstables("keyspace1", "standard1") if "tmplink" not in s] if len(sstables) > basecount + jobs: -sstables = [s for s in node.get_sstables("keyspace1", "standard1") if "tmplink" not in s] logger.error("---") for sstable in sstables: logger.error(sstable) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org