Compare HTTP status code to HTTPStatus enum
This commit is contained in:
@@ -13,6 +13,7 @@ from trytond.i18n import gettext
|
|||||||
from trytond.model import fields
|
from trytond.model import fields
|
||||||
from trytond.modules.edocument_peppol.exceptions import PeppolServiceError
|
from trytond.modules.edocument_peppol.exceptions import PeppolServiceError
|
||||||
from trytond.pool import Pool, PoolMeta
|
from trytond.pool import Pool, PoolMeta
|
||||||
|
from trytond.protocols.wrappers import HTTPStatus
|
||||||
from trytond.pyson import Eval
|
from trytond.pyson import Eval
|
||||||
from trytond.transaction import Transaction
|
from trytond.transaction import Transaction
|
||||||
|
|
||||||
@@ -86,7 +87,7 @@ class PeppolService(metaclass=PoolMeta):
|
|||||||
'Accept': 'application/json',
|
'Accept': 'application/json',
|
||||||
'X-Api-Key': self.peppyrus_api_key,
|
'X-Api-Key': self.peppyrus_api_key,
|
||||||
})
|
})
|
||||||
if response.status_code == 422:
|
if response.status_code == HTTPStatus.UNPROCESSABLE_CONTENT:
|
||||||
raise PeppolServiceError(response.json())
|
raise PeppolServiceError(response.json())
|
||||||
response.raise_for_status()
|
response.raise_for_status()
|
||||||
return response.json()['id']
|
return response.json()['id']
|
||||||
@@ -193,7 +194,7 @@ class PeppolService(metaclass=PoolMeta):
|
|||||||
'Accept': 'application/json',
|
'Accept': 'application/json',
|
||||||
'X-Api-Key': api_key,
|
'X-Api-Key': api_key,
|
||||||
})
|
})
|
||||||
if response.status_code != 404:
|
if response.status_code != HTTPStatus.NOT_FOUND:
|
||||||
response.raise_for_status()
|
response.raise_for_status()
|
||||||
except Exception:
|
except Exception:
|
||||||
if not silent:
|
if not silent:
|
||||||
|
|||||||
@@ -178,7 +178,7 @@ class CredentialSendcloud(sequence_ordered(), ModelSQL, ModelView, MatchMixin):
|
|||||||
response = requests.post(
|
response = requests.post(
|
||||||
SENDCLOUD_API_URL + 'parcels', json={'parcels': parcels},
|
SENDCLOUD_API_URL + 'parcels', json={'parcels': parcels},
|
||||||
auth=self.auth, timeout=timeout, headers=HEADERS)
|
auth=self.auth, timeout=timeout, headers=HEADERS)
|
||||||
if response.status_code == 400:
|
if response.status_code == HTTPStatus.BAD_REQUEST:
|
||||||
msg = response.json()['error']['message']
|
msg = response.json()['error']['message']
|
||||||
raise requests.HTTPError(msg, response=response)
|
raise requests.HTTPError(msg, response=response)
|
||||||
response.raise_for_status()
|
response.raise_for_status()
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import base64
|
|||||||
import json
|
import json
|
||||||
|
|
||||||
from trytond.pool import Pool
|
from trytond.pool import Pool
|
||||||
from trytond.protocols.wrappers import Response
|
from trytond.protocols.wrappers import HTTPStatus, Response
|
||||||
from trytond.tests.test_tryton import (
|
from trytond.tests.test_tryton import (
|
||||||
DB_NAME, Client, TestCase, activate_module, drop_db)
|
DB_NAME, Client, TestCase, activate_module, drop_db)
|
||||||
from trytond.transaction import Transaction
|
from trytond.transaction import Transaction
|
||||||
@@ -50,7 +50,7 @@ class RoutesTestCase(TestCase):
|
|||||||
|
|
||||||
response = c.get(self.data_url('res.user'), headers=self.auth_headers)
|
response = c.get(self.data_url('res.user'), headers=self.auth_headers)
|
||||||
|
|
||||||
self.assertEqual(response.status_code, 200)
|
self.assertEqual(response.status_code, HTTPStatus.OK)
|
||||||
self.assertEqual(response.data, b'\r\n\r\n')
|
self.assertEqual(response.data, b'\r\n\r\n')
|
||||||
|
|
||||||
def test_data_one_field(self):
|
def test_data_one_field(self):
|
||||||
@@ -61,7 +61,7 @@ class RoutesTestCase(TestCase):
|
|||||||
self.data_url('res.user'), headers=self.auth_headers,
|
self.data_url('res.user'), headers=self.auth_headers,
|
||||||
query_string=[('f', 'name')])
|
query_string=[('f', 'name')])
|
||||||
|
|
||||||
self.assertEqual(response.status_code, 200)
|
self.assertEqual(response.status_code, HTTPStatus.OK)
|
||||||
self.assertEqual(response.data, b'Nom\r\nAdministrator\r\n')
|
self.assertEqual(response.data, b'Nom\r\nAdministrator\r\n')
|
||||||
|
|
||||||
def test_data_multiple_fields(self):
|
def test_data_multiple_fields(self):
|
||||||
@@ -72,7 +72,7 @@ class RoutesTestCase(TestCase):
|
|||||||
self.data_url('res.user'), headers=self.auth_headers,
|
self.data_url('res.user'), headers=self.auth_headers,
|
||||||
query_string=[('f', 'name'), ('f', 'login')])
|
query_string=[('f', 'name'), ('f', 'login')])
|
||||||
|
|
||||||
self.assertEqual(response.status_code, 200)
|
self.assertEqual(response.status_code, HTTPStatus.OK)
|
||||||
self.assertEqual(
|
self.assertEqual(
|
||||||
response.data, b'Nom,Identifiant\r\nAdministrator,admin\r\n')
|
response.data, b'Nom,Identifiant\r\nAdministrator,admin\r\n')
|
||||||
|
|
||||||
@@ -88,7 +88,7 @@ class RoutesTestCase(TestCase):
|
|||||||
('d', json.dumps([('code', '=', 'fr')])),
|
('d', json.dumps([('code', '=', 'fr')])),
|
||||||
])
|
])
|
||||||
|
|
||||||
self.assertEqual(response.status_code, 200)
|
self.assertEqual(response.status_code, HTTPStatus.OK)
|
||||||
self.assertEqual(response.data, 'Nom\r\nFrançais\r\n'.encode('utf-8'))
|
self.assertEqual(response.data, 'Nom\r\nFrançais\r\n'.encode('utf-8'))
|
||||||
|
|
||||||
def test_data_size(self):
|
def test_data_size(self):
|
||||||
@@ -102,7 +102,7 @@ class RoutesTestCase(TestCase):
|
|||||||
('s', 5),
|
('s', 5),
|
||||||
])
|
])
|
||||||
|
|
||||||
self.assertEqual(response.status_code, 200)
|
self.assertEqual(response.status_code, HTTPStatus.OK)
|
||||||
self.assertEqual(len(response.data.splitlines()), 5 + 1)
|
self.assertEqual(len(response.data.splitlines()), 5 + 1)
|
||||||
|
|
||||||
def test_data_page(self):
|
def test_data_page(self):
|
||||||
@@ -124,8 +124,8 @@ class RoutesTestCase(TestCase):
|
|||||||
('p', 1)
|
('p', 1)
|
||||||
])
|
])
|
||||||
|
|
||||||
self.assertEqual(response0.status_code, 200)
|
self.assertEqual(response0.status_code, HTTPStatus.OK)
|
||||||
self.assertEqual(response1.status_code, 200)
|
self.assertEqual(response1.status_code, HTTPStatus.OK)
|
||||||
self.assertNotEqual(response0.data, response1.data)
|
self.assertNotEqual(response0.data, response1.data)
|
||||||
|
|
||||||
def test_data_encoding(self):
|
def test_data_encoding(self):
|
||||||
@@ -141,7 +141,7 @@ class RoutesTestCase(TestCase):
|
|||||||
('enc', 'latin1'),
|
('enc', 'latin1'),
|
||||||
])
|
])
|
||||||
|
|
||||||
self.assertEqual(response.status_code, 200)
|
self.assertEqual(response.status_code, HTTPStatus.OK)
|
||||||
self.assertEqual(
|
self.assertEqual(
|
||||||
response.data, 'Nom\r\nFrançais\r\n'.encode('latin1'))
|
response.data, 'Nom\r\nFrançais\r\n'.encode('latin1'))
|
||||||
|
|
||||||
@@ -153,7 +153,7 @@ class RoutesTestCase(TestCase):
|
|||||||
self.data_url('res.user'), headers=self.auth_headers,
|
self.data_url('res.user'), headers=self.auth_headers,
|
||||||
query_string=[('f', 'name'), ('f', 'login'), ('dl', '|')])
|
query_string=[('f', 'name'), ('f', 'login'), ('dl', '|')])
|
||||||
|
|
||||||
self.assertEqual(response.status_code, 200)
|
self.assertEqual(response.status_code, HTTPStatus.OK)
|
||||||
self.assertEqual(
|
self.assertEqual(
|
||||||
response.data, b'Nom|Identifiant\r\nAdministrator|admin\r\n')
|
response.data, b'Nom|Identifiant\r\nAdministrator|admin\r\n')
|
||||||
|
|
||||||
@@ -166,7 +166,7 @@ class RoutesTestCase(TestCase):
|
|||||||
query_string=[
|
query_string=[
|
||||||
('f', 'name'), ('f', 'login'), ('dl', 'n'), ('qc', '*')])
|
('f', 'name'), ('f', 'login'), ('dl', 'n'), ('qc', '*')])
|
||||||
|
|
||||||
self.assertEqual(response.status_code, 200)
|
self.assertEqual(response.status_code, HTTPStatus.OK)
|
||||||
self.assertEqual(
|
self.assertEqual(
|
||||||
response.data,
|
response.data,
|
||||||
b'Nomn*Identifiant*\r\n*Administrator*n*admin*\r\n')
|
b'Nomn*Identifiant*\r\n*Administrator*n*admin*\r\n')
|
||||||
@@ -179,7 +179,7 @@ class RoutesTestCase(TestCase):
|
|||||||
self.data_url('res.user'), headers=self.auth_headers,
|
self.data_url('res.user'), headers=self.auth_headers,
|
||||||
query_string=[('f', 'name'), ('h', 0)])
|
query_string=[('f', 'name'), ('h', 0)])
|
||||||
|
|
||||||
self.assertEqual(response.status_code, 200)
|
self.assertEqual(response.status_code, HTTPStatus.OK)
|
||||||
self.assertEqual(response.data, b'Administrator\r\n')
|
self.assertEqual(response.data, b'Administrator\r\n')
|
||||||
|
|
||||||
def test_data_locale_format(self):
|
def test_data_locale_format(self):
|
||||||
@@ -193,6 +193,6 @@ class RoutesTestCase(TestCase):
|
|||||||
self.data_url('res.user'), headers=self.auth_headers,
|
self.data_url('res.user'), headers=self.auth_headers,
|
||||||
query_string=[('f', 'create_date'), ('loc', 1)])
|
query_string=[('f', 'create_date'), ('loc', 1)])
|
||||||
|
|
||||||
self.assertEqual(response_std.status_code, 200)
|
self.assertEqual(response_std.status_code, HTTPStatus.OK)
|
||||||
self.assertEqual(response_locale.status_code, 200)
|
self.assertEqual(response_locale.status_code, HTTPStatus.OK)
|
||||||
self.assertNotEqual(response_std.data, response_locale.data)
|
self.assertNotEqual(response_std.data, response_locale.data)
|
||||||
|
|||||||
Reference in New Issue
Block a user