]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
qa/tasks/ceph_objectstore_tool: drop six dependency
authorKefu Chai <kchai@redhat.com>
Sun, 28 Jun 2020 11:59:39 +0000 (19:59 +0800)
committerKefu Chai <kchai@redhat.com>
Sun, 5 Jul 2020 02:58:28 +0000 (10:58 +0800)
Signed-off-by: Kefu Chai <kchai@redhat.com>
qa/tasks/ceph_objectstore_tool.py

index e19a0bd218e2920ab64f9d2e12c532b691968a33..93b5a4d7c962c174f242c1d87772832e196e5359 100644 (file)
@@ -7,7 +7,6 @@ import contextlib
 import json
 import logging
 import os
-import six
 import sys
 import tempfile
 import time
@@ -487,8 +486,8 @@ def test_objectstore(ctx, config, cli_remote, REP_POOL, REP_NAME, ec=False):
                                 log.error("failed with " +
                                           str(proc.exitstatus))
                                 log.error(" ".join([
-                                    six.ensure_str(proc.stdout.getvalue()),
-                                    six.ensure_str(proc.stderr.getvalue()),
+                                    proc.stdout.getvalue().decode(),
+                                    proc.stderr.getvalue().decode(),
                                     ]))
                                 ERRORS += 1