From: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
Date: Tue, 17 Dec 2019 00:46:26 +0000 (+0100)
Subject: qa/tasks/workunit: py3 compat
X-Git-Tag: v14.2.10~17^2~116
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f6ef7977c477b1eb3cf8ff8faf5d0f1d0064acf5;p=ceph.git

qa/tasks/workunit: py3 compat

Use six.ensure_str for `get_file()` output in order to
make code py3 compatible

Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
(cherry picked from commit ae6befb3be46d84da67092aff8bff95d9f646aea)
---

diff --git a/qa/tasks/workunit.py b/qa/tasks/workunit.py
index 6a4b7cb0fedc..4372c2549f07 100644
--- a/qa/tasks/workunit.py
+++ b/qa/tasks/workunit.py
@@ -359,7 +359,7 @@ def _run_tests(ctx, refspec, role, tests, env, basedir,
     )
 
     workunits_file = '{tdir}/workunits.list.{role}'.format(tdir=testdir, role=role)
-    workunits = sorted(misc.get_file(remote, workunits_file).split('\0'))
+    workunits = sorted(six.ensure_str(misc.get_file(remote, workunits_file)).split('\0'))
     assert workunits
 
     try: