Merge pull request #1828 from pkit/fix_error_from_httpex

fixes create_api_error_from_http_exception()
This commit is contained in:
Joffrey F 2017-12-18 14:26:47 -08:00 committed by GitHub
commit 5736436966
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 2 deletions

View File

@ -18,7 +18,7 @@ def create_api_error_from_http_exception(e):
try:
explanation = response.json()['message']
except ValueError:
explanation = response.content.strip()
explanation = (response.content or '').strip()
cls = APIError
if response.status_code == 404:
if explanation and ('No such image' in str(explanation) or

View File

@ -3,7 +3,8 @@ import unittest
import requests
from docker.errors import (APIError, ContainerError, DockerException,
create_unexpected_kwargs_error)
create_unexpected_kwargs_error,
create_api_error_from_http_exception)
from .fake_api import FAKE_CONTAINER_ID, FAKE_IMAGE_ID
from .fake_api_client import make_fake_client
@ -78,6 +79,19 @@ class APIErrorTest(unittest.TestCase):
err = APIError('', response=resp)
assert err.is_client_error() is True
def test_create_error_from_exception(self):
resp = requests.Response()
resp.status_code = 500
err = APIError('')
try:
resp.raise_for_status()
except requests.exceptions.HTTPError as e:
try:
create_api_error_from_http_exception(e)
except APIError as e:
err = e
assert err.is_server_error() is True
class ContainerErrorTest(unittest.TestCase):
def test_container_without_stderr(self):