PR#381: Don't traceback when the PlusPlus service isn't reachable - fedora-hubs

Aurélien Bompard • 6 years ago

ef755b6

file modified

		`@@ -3,6 +3,7 @@`
		`import json`

		`import mock`
		`+ import requests`

		`import hubs`
		`from hubs.models import Hub, Widget`
		`@@ -172,3 +173,11 @@`
		`result = self.app.get(url)`
		`self.assertEqual(result.status_code, 404)`
		`self.assertEqual(result.get_data(as_text=True), 'User does not exist')`
		`+`
		`+ @mock.patch('requests.get')`
		`+ def test_plus_plus_connection_error(self, mock_get):`
		`+ mock_get.side_effect = requests.ConnectionError("connection error")`
		`+ url = "/ralph/w/contact/%d/plus-plus/%s/status" % (`
		`+ self.widget_idx, "decause")`
		`+ result = self.app.get(url)`
		`+ self.assertEqual(result.status_code, 504)`

hubs/widgets/contact/__init__.py

file modified

		`@@ -93,6 +93,8 @@`
		`req = requests.get(pp_url, timeout=5)`
		`except requests.Timeout:`
		`return 'The request to {url} timed out'.format(url=pp_url), 504`
		`+ except requests.ConnectionError:`
		`+ return 'Could not connect to {url}'.format(url=pp_url), 504`
		`if req.status_code == 200:`
		`return flask.jsonify(req.json())`
		`else:`