[cassandra-dtest] branch trunk updated: Rework check_output text usage for python < 3.7

[br...@apache.org]

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 010f7ce6 Rework check_output text usage for python < 3.7
010f7ce6 is described below

commit 010f7ce609d7dfad280e81c155b99c2b3b8da212
Author: Brandon Williams <br...@apache.org>
AuthorDate: Mon Oct 24 18:18:31 2022 -0500

    Rework check_output text usage for python < 3.7
---
 tools/jmxutils.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/jmxutils.py b/tools/jmxutils.py
index 8d82815f..b08f3591 100644
--- a/tools/jmxutils.py
+++ b/tools/jmxutils.py
@@ -216,11 +216,11 @@ class JolokiaAgent(object):
         tries = 3
         for i in range(tries):
             try:
-                subprocess.check_output(args, stderr=subprocess.STDOUT, text=True)
+                subprocess.check_output(args, stderr=subprocess.STDOUT)
                 logger.info("Jolokia successful on try %s" % i )
                 return
             except subprocess.CalledProcessError as exc:
-                if 'Jolokia is already attached' in exc.output:
+                if 'Jolokia is already attached'.encode('utf-8') in exc.output:
                     logger.info("Jolokia reports being attached on try %s, returning successfully" % i)
                     return;
                 if i < tries - 1:


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org