]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
test/rgw/rgw_multi: do not decode a str
authorKefu Chai <kchai@redhat.com>
Mon, 6 Apr 2020 07:03:22 +0000 (15:03 +0800)
committerKefu Chai <kchai@redhat.com>
Sun, 14 Jun 2020 08:34:53 +0000 (16:34 +0800)
commit619198d419fad90800cb6ac63cbfda9ce02159de
tree876aa7c4c6962710bd2f66328930c82b1307f302
parent96b6414a6ef70a0f5dc3dcbfb1aef677dc2d0db1
test/rgw/rgw_multi: do not decode a str

`s` comes from `rgwadmin()`, which passes `StringIO` as stdout, so the
the output should an instance of `str` in both Python2 and Python3.
hence there is no need to decode it using UTF-8 codecs again.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 7202d8a72c749a152a648dcbbcd86387dc988672)
src/test/rgw/rgw_multi/multisite.py
src/test/rgw/rgw_multi/tests.py