From 4e80317717cbf65fa1ba1eb08b8cc9baff3ecd64 Mon Sep 17 00:00:00 2001 From: Florent Date: Wed, 19 Mar 2014 17:30:51 +0100 Subject: [PATCH] Update tests --- modules/dresdenwetter/pages.py | 2 +- modules/dresdenwetter/test.py | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/modules/dresdenwetter/pages.py b/modules/dresdenwetter/pages.py index 3c366d41..e6a7c106 100644 --- a/modules/dresdenwetter/pages.py +++ b/modules/dresdenwetter/pages.py @@ -48,7 +48,7 @@ class StartPage(HTMLPage): unit = u'°C' else: value = text.split(':')[-1].split()[0] - unit = text.split(':')[-1].split()[1] + unit = text.split(':')[-1].split(None, 1)[1] return value, unit def parse(self, el): diff --git a/modules/dresdenwetter/test.py b/modules/dresdenwetter/test.py index 60b0750c..7a8fd01f 100644 --- a/modules/dresdenwetter/test.py +++ b/modules/dresdenwetter/test.py @@ -36,21 +36,21 @@ class DresdenWetterTest(BackendTest): self.assertTrue(len(l[0].sensors) > 5, msg="Not enough sensors") def test_sensors_value(self): - temperature = self.backend.get_last_measure("dd-temperatur").level + temperature = self.backend.get_last_measure("dd-Temperatur2m").level self.assertTrue(temperature > -50., msg="To cold") self.assertTrue(temperature < 50., msg="Temperature to high") - self.assertTrue(self.backend.get_last_measure("dd-wind").level >= 0) - self.assertTrue(self.backend.get_last_measure("dd-luftdruck").level > 800.) - self.assertTrue(self.backend.get_last_measure("dd-luftfeuchtigkeit").level >= 0.) - self.assertTrue(self.backend.get_last_measure("dd-niederschlag").level >= 0.) - self.assertTrue(self.backend.get_last_measure("dd-globalstrahlung").level >= 0.) + self.assertTrue(self.backend.get_last_measure(u"dd-Wind10minØ").level >= 0) + self.assertTrue(self.backend.get_last_measure("dd-RelLuftdruck").level > 800.) + self.assertTrue(self.backend.get_last_measure("dd-RelLuftfeuchtigkeit").level >= 0.) + self.assertTrue(self.backend.get_last_measure("dd-Niederschlagseit001Uhr").level >= 0.) + self.assertTrue(self.backend.get_last_measure("dd-Globalstrahlung").level >= 0.) def test_temperature(self): """ test the first sensor return by module" """ temperature = list(self.backend.iter_sensors("wetter", "Temperatur")) - assert temperature[0].name == u"Temperatur" + assert temperature[0].name == u"Temperatur 2m" assert temperature[0].unit == u"°C" def test_globalstrahlung(self): @@ -58,4 +58,4 @@ class DresdenWetterTest(BackendTest): Test the last sensor return by module" """ sensor = list(self.backend.iter_sensors("wetter", "Globalstrahlung")) - assert sensor[0].unit == u"W/m²" + assert sensor[0].unit == u"W/m 2"