Meerdere foutmeldingen Buienradar API #776

Author: dennissiemensma

docs/changelog.rst

@@ -4,7 +4,7 @@ Changelog
 v2.11.0 - 2019-xx-xx
 
 - [`#774 <https://github.com/dennissiemensma/dsmr-reader/issues/774>`_] Generic performance improvements
-
+- [`#776 <https://github.com/dennissiemensma/dsmr-reader/issues/776>`_] Meerdere foutmeldingen Buienradar API
 
 ----
 

dsmr_mindergas/services.py

@@ -76,4 +76,4 @@ def export():
 
     if response.status_code != 201:
         logger.error('MinderGas: Upload failed (HTTP %s): %s', response.status_code, response.text)
-        raise AssertionError(_('Invalid status code'))
+        raise AssertionError(_('Unexpected status code received'))

dsmr_weather/services.py

@@ -32,18 +32,23 @@ def run(scheduled_process):
 def get_temperature_from_api():
     # For backend logging in Supervisor.
     logger.debug('Buienradar: Reading temperature: %s', settings.DSMRREADER_BUIENRADAR_API_URL)
-    response = requests.get(settings.DSMRREADER_BUIENRADAR_API_URL)
+
+    try:
+        response = requests.get(settings.DSMRREADER_BUIENRADAR_API_URL)
+    except Exception as error:
+        logger.exception(error)
+        raise AssertionError(_('Failed to connect to or read from Buienradar API'))
 
     if response.status_code != 200:
         logger.error('Buienradar: Failed reading temperature: HTTP %s', response.status_code)
-        raise EnvironmentError('Unexpected status code received')
+        raise AssertionError(_('Unexpected status code received'))
 
     # Find our selected station.
     station_id = WeatherSettings.get_solo().buienradar_station
     station_data = [x for x in response.json()['actual']['stationmeasurements'] if x['stationid'] == station_id]
 
     if not station_data:
-        raise EnvironmentError('Selected station info not found')
+        raise AssertionError(_('Selected station info not found'))
 
     temperature = station_data[0]['groundtemperature']
     logger.debug('Buienradar: Read temperature: %s', temperature)

dsmr_weather/tests/test_services.py

@@ -24,7 +24,7 @@ def setUp(self):
     @mock.patch('django.utils.timezone.now')
     def test_exception_handling(self, now_mock, get_temperature_from_api_mock, display_dashboard_message_mock):
         now_mock.return_value = timezone.make_aware(timezone.datetime(2017, 1, 1))
-        get_temperature_from_api_mock.side_effect = EnvironmentError('TEST')  # Simulate any exception.
+        get_temperature_from_api_mock.side_effect = AssertionError('TEST')  # Simulate any exception.
 
         dsmr_weather.services.run(self.schedule_process)
         self.assertTrue(display_dashboard_message_mock.called)
@@ -60,13 +60,22 @@ def test_okay(self, now_mock, requests_mock):
 
     @mock.patch('requests.get')
     @mock.patch('django.utils.timezone.now')
-    def test_fail_http(self, now_mock, requests_mock):
+    def test_fail_http_connection(self, now_mock, requests_mock):
+        now_mock.return_value = timezone.make_aware(timezone.datetime(2017, 1, 1))
+        requests_mock.side_effect = IOError('Failed to connect')  # Any error is fine.
+
+        with self.assertRaises(AssertionError):
+            dsmr_weather.services.get_temperature_from_api()
+
+    @mock.patch('requests.get')
+    @mock.patch('django.utils.timezone.now')
+    def test_fail_http_response(self, now_mock, requests_mock):
         now_mock.return_value = timezone.make_aware(timezone.datetime(2017, 1, 1))
         response_mock = mock.MagicMock()
         type(response_mock).status_code = mock.PropertyMock(return_value=500)
         requests_mock.return_value = response_mock
 
-        with self.assertRaises(EnvironmentError):
+        with self.assertRaises(AssertionError):
             dsmr_weather.services.get_temperature_from_api()
 
     @mock.patch('requests.get')
@@ -85,5 +94,5 @@ def test_fail_station(self, now_mock, requests_mock):
         type(response_mock).status_code = mock.PropertyMock(return_value=200)
         requests_mock.return_value = response_mock
 
-        with self.assertRaises(EnvironmentError):
+        with self.assertRaises(AssertionError):
             dsmr_weather.services.get_temperature_from_api()

dsmrreader/__init__.py

@@ -1,5 +1,5 @@
 from django.utils.version import get_version
 
-VERSION = (2, 11, 0, 'beta', 2)
+VERSION = (2, 11, 0, 'beta', 3)
 
 __version__ = get_version(VERSION)

dsmrreader/locales/nl/LC_MESSAGES/django.mo

@@ -1300,8 +1300,8 @@ msgstr "Exporteren naar MinderGas gefaald: {}"
 msgid "No recent gas reading found"
 msgstr "Geen recente gasmeting gevonden"
 
-msgid "Invalid status code"
-msgstr "Ongeldige statuscode"
+msgid "Unexpected status code received"
+msgstr "Onverwachte statuscode ontvangen"
 
 msgid "Detailed instructions for configuring MQTT can be found here: <a href=\"https://dsmr-reader.readthedocs.io/nl/v2/mqtt.html\">Documentation</a>"
 msgstr "Gedetailleerde instructies voor configureren van MQTT kun je hier terugvinden: <a href=\"https://dsmr-reader.readthedocs.io/nl/v2/mqtt.html\">Documentatie</a>"
@@ -2179,12 +2179,21 @@ msgstr "Weergegevensconfiguratie"
 msgid "Failed to read Buienradar API: {}"
 msgstr "Uitlezen van Buienradar API mislukt: {}"
 
+msgid "Failed to connect to or read from Buienradar API"
+msgstr "Kan niet verbinden naar of lezen van de Buienradar API"
+
+msgid "Selected station info not found"
+msgstr "Geselecteerd weerstation niet gevonden"
+
 msgid "Dutch"
 msgstr "Nederlands"
 
 msgid "English"
 msgstr "Engels"
 
+#~ msgid "Invalid status code"
+#~ msgstr "Ongeldige statuscode"
+
 #~ msgid "Internals"
 #~ msgstr "Intern"