You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by mc...@apache.org on 2020/04/17 09:02:07 UTC
[cassandra-dtest] branch master updated: Fix SyntaxWarnings with
Python3.8
This is an automated email from the ASF dual-hosted git repository.
mck pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git
The following commit(s) were added to refs/heads/master by this push:
new 9ec133b Fix SyntaxWarnings with Python3.8
9ec133b is described below
commit 9ec133b2f728ef0dd9d5995af61a0ef61dc47525
Author: Eduard Tudenhoefner <ed...@datastax.com>
AuthorDate: Thu Apr 16 10:18:29 2020 +0200
Fix SyntaxWarnings with Python3.8
patch by Eduard Tudenhöfner; reviewed by Mick Semb Wever for CASSANDRA-15736
---
conftest.py | 4 ++--
dtest_setup.py | 6 +++---
upgrade_tests/cql_tests.py | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/conftest.py b/conftest.py
index 0229ae0..7cc3acc 100644
--- a/conftest.py
+++ b/conftest.py
@@ -209,7 +209,7 @@ def check_logs_for_errors(dtest_setup):
errors = []
for node in dtest_setup.cluster.nodelist():
errors = list(_filter_errors(dtest_setup, ['\n'.join(msg) for msg in node.grep_log_for_errors()]))
- if len(errors) is not 0:
+ if len(errors) != 0:
for error in errors:
if isinstance(error, (bytes, bytearray)):
error_str = error.decode("utf-8").strip()
@@ -242,7 +242,7 @@ def copy_logs(request, cluster, directory=None, name=None):
os.mkdir(directory)
logs = [(node.name, node.logfilename(), node.debuglogfilename(), node.gclogfilename(), node.compactionlogfilename())
for node in list(cluster.nodes.values())]
- if len(logs) is not 0:
+ if len(logs) != 0:
basedir = str(int(time.time() * 1000)) + '_' + request.node.name
logdir = os.path.join(directory, basedir)
os.mkdir(logdir)
diff --git a/dtest_setup.py b/dtest_setup.py
index 107028d..abc50b5 100644
--- a/dtest_setup.py
+++ b/dtest_setup.py
@@ -121,7 +121,7 @@ class DTestSetup(object):
for nodename, errors in list(errordata.items()):
filtered_errors = list(self.__filter_errors(['\n'.join(msg) for msg in errors]))
- if len(filtered_errors) is not 0:
+ if len(filtered_errors) != 0:
reportable_errordata[nodename] = filtered_errors
# no errors worthy of halting the test
@@ -149,7 +149,7 @@ class DTestSetup(object):
logs = [(node.name, node.logfilename(), node.debuglogfilename(), node.gclogfilename(),
node.compactionlogfilename())
for node in self.cluster.nodelist()]
- if len(logs) is not 0:
+ if len(logs) != 0:
basedir = str(int(time.time() * 1000)) + '_' + str(id(self))
logdir = os.path.join(directory, basedir)
os.mkdir(logdir)
@@ -283,7 +283,7 @@ class DTestSetup(object):
for node in self.cluster.nodelist():
errors = list(self.__filter_errors(
['\n'.join(msg) for msg in node.grep_log_for_errors()]))
- if len(errors) is not 0:
+ if len(errors) != 0:
for error in errors:
print("Unexpected error in {node_name} log, error: \n{error}".format(node_name=node.name, error=error))
return True
diff --git a/upgrade_tests/cql_tests.py b/upgrade_tests/cql_tests.py
index d3475a3..4bb9630 100644
--- a/upgrade_tests/cql_tests.py
+++ b/upgrade_tests/cql_tests.py
@@ -1182,7 +1182,7 @@ class TestCQL(UpgradeTester):
cursor.execute("DELETE FROM test WHERE k=2")
- assert_all(cursor, "SELECT k FROM test", [[k] for k in range(0, 5) if k is not 2], ignore_order=True)
+ assert_all(cursor, "SELECT k FROM test", [[k] for k in range(0, 5) if k != 2], ignore_order=True)
# Example from #3505
cursor.execute("USE ks1")
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org