docker
/
docker-py
mirror of https://github.com/docker/docker-py.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

exec_resize is incorrectly passing param as json

This commit is contained in:
Xiaojian Huang 2015-04-28 19:50:15 -07:00
parent bd5eaedec9
commit b9909c68f9
2 changed files with 9 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
docker/client.py
View File

@ -567,14 +567,11 @@ class Client(requests.Session):
raise errors.InvalidVersion('Exec is not supported in API < 1.15') raise errors.InvalidVersion('Exec is not supported in API < 1.15')
if isinstance(exec_id, dict): if isinstance(exec_id, dict):
exec_id = exec_id.get('Id') exec_id = exec_id.get('Id')
data = {
'h': height, params = {'h': height, 'w': width}
'w': width url = self._url("/exec/{0}/resize".format(exec_id))
} res = self._post(url, params=params)
res = self._post_json( self._raise_for_status(res)
self._url('/exec/{0}/resize'.format(exec_id)), data
)
res.raise_for_status()
def exec_start(self, exec_id, detach=False, tty=False, stream=False): def exec_start(self, exec_id, detach=False, tty=False, stream=False):
if utils.compare_version('1.15', self._version) < 0: if utils.compare_version('1.15', self._version) < 0:

20
tests/test.py
View File

@ -1662,22 +1662,10 @@ class DockerClientTest(Cleanup, base.BaseTestCase):
except Exception as e: except Exception as e:
self.fail('Command should not raise exception: {0}'.format(e)) self.fail('Command should not raise exception: {0}'.format(e))
args = fake_request.call_args fake_request.assert_called_with(
self.assertEqual( url_prefix + 'exec/{0}/resize'.format(fake_api.FAKE_EXEC_ID),
args[0][0], url_prefix + 'exec/{0}/resize'.format( params={'h': 20, 'w': 60},
fake_api.FAKE_EXEC_ID timeout=DEFAULT_TIMEOUT_SECONDS
)
)
self.assertEqual(
json.loads(args[1]['data']), {
'h': 20,
'w': 60,
}
)
self.assertEqual(
args[1]['headers'], {'Content-Type': 'application/json'}
) )
def test_pause_container(self): def test_pause_container(self):