Merge "Fix Python 3 compatiblity in K8sClient.watch()"
This commit is contained in:
commit
c265560fa8
@ -197,7 +197,7 @@ class K8sClient(object):
|
||||
headers=header)) as response:
|
||||
if not response.ok:
|
||||
raise exc.K8sClientException(response.text)
|
||||
for line in response.iter_lines(delimiter='\n'):
|
||||
line = line.strip()
|
||||
for line in response.iter_lines():
|
||||
line = line.decode('utf-8').strip()
|
||||
if line:
|
||||
yield jsonutils.loads(line)
|
||||
|
@ -311,7 +311,7 @@ class TestK8sClient(test_base.TestCase):
|
||||
def test_watch(self, m_get):
|
||||
path = '/test'
|
||||
data = [{'obj': 'obj%s' % i} for i in range(3)]
|
||||
lines = [jsonutils.dumps(i) for i in data]
|
||||
lines = [jsonutils.dump_as_bytes(i) for i in data]
|
||||
|
||||
m_resp = mock.MagicMock()
|
||||
m_resp.ok = True
|
||||
|
Loading…
Reference in New Issue
Block a user