openstack/swift
Code Issues Proposed changes

py3: fix object-replicator rsync output parsing

Browse Source 
Change-Id: I07707e99e4232b2cbe14986b958ce43c003a1ab6
This commit is contained in:
Tim Burke 2019-07-15 18:07:51 -07:00
parent 4643412bd1
commit ebf561026f
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
swift/obj/replicator.py
View File

@ -394,7 +394,7 @@ class ObjectReplicator(Daemon):
return 1 # failure response code
total_time = time.time() - start_time
for result in results.split('\n'):
for result in results.decode('utf8').split('\n'):
if result == '':
continue
if result.startswith('cd+'):

4
test/unit/obj/test_replicator.py
View File

@ -19,6 +19,7 @@ import os
import mock
from gzip import GzipFile
from shutil import rmtree
import six
import six.moves.cPickle as pickle
import time
import tempfile
@ -124,7 +125,8 @@ def _mock_process(ret):
MockProcess.captured_log = captured_log
orig_process = subprocess.Popen
MockProcess.ret_code = (i[0] for i in ret)
MockProcess.ret_log = (i[1] for i in ret)
MockProcess.ret_log = (i[1] if six.PY2 else i[1].encode('utf8')
for i in ret)
MockProcess.check_args = (i[2] for i in ret)
object_replicator.subprocess.Popen = MockProcess
yield captured_log