]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
qa/tasks/workunit: py3 compat
authorKyr Shatskyy <kyrylo.shatskyy@suse.com>
Tue, 17 Dec 2019 00:46:26 +0000 (01:46 +0100)
committerKefu Chai <kchai@redhat.com>
Tue, 2 Jun 2020 02:32:22 +0000 (10:32 +0800)
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)

qa/tasks/workunit.py

index 6a4b7cb0fedc43db8962f64547ba554e0add9a94..4372c2549f0776579b028b4901682e107c6fce0c 100644 (file)
@@ -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: