From 7eabba09bccc2e2943f30896e3b6db60c9e6cb22 Mon Sep 17 00:00:00 2001
From: Iuri de Silvio <iurisilvio@gmail.com>
Date: Sat, 29 Nov 2014 11:49:47 -0200
Subject: [PATCH] =?UTF-8?q?=5Fget=5Finfo=5Ffrom=5Fsource=20n=C3=A3o=20prec?=
=?UTF-8?q?isa=20lan=C3=A7ar=20ValueError.=20A=20pr=C3=B3pria=20rota=20de?=
=?UTF-8?q?=20CEP=20j=C3=A1=20trata=20o=20caso=20de=20CEP=20n=C3=A3o=20exi?=
=?UTF-8?q?stir.=20Isso=20n=C3=A3o=20=C3=A9=20um=20erro.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
PostmonServer.py | 10 ++--------
test/postmon_test.py | 4 ++--
2 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/PostmonServer.py b/PostmonServer.py
index 73af5e2..2c86389 100644
--- a/PostmonServer.py
+++ b/PostmonServer.py
@@ -7,7 +7,7 @@ import xmltodict
from bottle import route, run, response, template, HTTPResponse
from CepTracker import CepTracker
import requests
-from packtrack import Correios, Royal
+from packtrack import Correios
from database import MongoDb as Database
@@ -33,10 +33,7 @@ def expired(record_date):
def _get_info_from_source(cep):
tracker = CepTracker()
- info = tracker.track(cep)
- if len(info) == 0:
- raise ValueError('CEP %s nao encontrado' % cep)
- return info
+ return tracker.track(cep)
def format_result(result):
@@ -100,9 +97,6 @@ def verifica_cep(cep):
result = None
try:
info = _get_info_from_source(cep)
- except ValueError:
- message = '404 CEP %s nao encontrado' % cep
- logger.exception(message)
except requests.exceptions.RequestException:
message = '503 Servico Temporariamente Indisponivel'
logger.exception(message)
diff --git a/test/postmon_test.py b/test/postmon_test.py
index 89e55e4..af5346e 100644
--- a/test/postmon_test.py
+++ b/test/postmon_test.py
@@ -212,7 +212,7 @@ class PostmonErrors(unittest.TestCase):
@mock.patch('PostmonServer._get_info_from_source')
def test_404_status(self, _mock):
- _mock.side_effect = ValueError('test')
+ _mock.return_value = []
response = self.get_cep('99999999', expect_errors=True)
self.assertEqual("404 CEP 99999999 nao encontrado", response.status)
self.assertEqual('application/json', response.headers['Content-Type'])
@@ -220,7 +220,7 @@ class PostmonErrors(unittest.TestCase):
@mock.patch('PostmonServer._get_info_from_source')
def test_404_status_with_xml_format(self, _mock):
- _mock.side_effect = ValueError('test')
+ _mock.return_value = []
response = self.get_cep('99999999', format='xml', expect_errors=True)
self.assertEqual("404 CEP 99999999 nao encontrado", response.status)
self.assertEqual('application/xml', response.headers['Content-Type'])
--
GitLab