Merge pull request #163 from peternewman/plugfest

Fix a longstanding bug in returning the latest software version

Author: peternewman

common.py

@@ -74,12 +74,12 @@ def GetLatestSoftware(responder):
     A SoftwareVersion object or None.
   """
   max_version = None
-  version = None
+  max_version_info = None
   for version in responder.software_version_set:
     if max_version is None or version.version_id > max_version:
       max_version = version.version_id
-      version = version
-  return version
+      max_version_info = version
+  return max_version_info
 
 
 def LookupProductCategory(category_id):

data/controller_test.py

@@ -0,0 +1,47 @@
+#!/usr/bin/python
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Library General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# controller_test.py
+# Copyright (C) 2017 Peter Newman
+
+import unittest
+
+class TestControllerData(unittest.TestCase):
+  """ Test the controller data files are valid."""
+  def setUp(self):
+    globals = {}
+    locals = {}
+    execfile("data/controller_data.py", globals, locals)
+    self.data = locals['CONTROLLER_DATA']
+
+  def test_ControllerData(self):
+    # Check the type
+    self.assertEqual(type(self.data), dict)
+
+    for esta_id in self.data:
+      self.assertEqual(int, type(esta_id))
+      self.assertEqual(list, type(self.data[esta_id]))
+
+      seen_names = set()
+
+      for controller in self.data[esta_id]:
+        name = controller['name']
+        self.assertNotIn(name, seen_names,
+                         "Name %s for ESTA ID 0x%04x is present twice" % (name, esta_id))
+        seen_names.add(name)
+
+
+if __name__ == '__main__':
+  unittest.main()

data/model_test.py

@@ -0,0 +1,35 @@
+#!/usr/bin/python
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Library General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# model_test.py
+# Copyright (C) 2017 Peter Newman
+
+import unittest
+
+class TestDeviceModelData(unittest.TestCase):
+  """ Test the device model data files are valid."""
+  def setUp(self):
+    globals = {}
+    locals = {}
+    execfile("data/model_data.py", globals, locals)
+    self.data = locals['DEVICE_MODEL_DATA']
+
+  def test_DeviceModelData(self):
+    # Because there may not be model data present, we just check the type
+    self.assertEqual(type(self.data), dict)
+
+
+if __name__ == '__main__':
+  unittest.main()

data/node_data.py

@@ -13,9 +13,9 @@
 #  along with this program; if not, write to the Free Software
 #  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #
-# splitter_data.py
+# node_data.py
 # Copyright (C) 2012 Simon Newton
-# Data for the splitters & distribution units.
+# Data for the nodes.
 
 NODE_DATA = {
   0x414c: [

data/node_test.py

@@ -0,0 +1,47 @@
+#!/usr/bin/python
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Library General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# node_test.py
+# Copyright (C) 2017 Peter Newman
+
+import unittest
+
+class TestNodeData(unittest.TestCase):
+  """ Test the node data files are valid."""
+  def setUp(self):
+    globals = {}
+    locals = {}
+    execfile("data/node_data.py", globals, locals)
+    self.data = locals['NODE_DATA']
+
+  def test_NodeData(self):
+    # Check the type
+    self.assertEqual(type(self.data), dict)
+
+    for esta_id in self.data:
+      self.assertEqual(int, type(esta_id))
+      self.assertEqual(list, type(self.data[esta_id]))
+
+      seen_names = set()
+
+      for node in self.data[esta_id]:
+        name = node['name']
+        self.assertNotIn(name, seen_names,
+                         "Name %s for ESTA ID 0x%04x is present twice" % (name, esta_id))
+        seen_names.add(name)
+
+
+if __name__ == '__main__':
+  unittest.main()

data/sensor_test.py

@@ -0,0 +1,46 @@
+#!/usr/bin/python
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Library General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# sensor_test.py
+# Copyright (C) 2017 Peter Newman
+
+import unittest
+
+class TestSensorTypes(unittest.TestCase):
+  """ Test the sensor types data file is valid."""
+  def setUp(self):
+    globals = {}
+    locals = {}
+    execfile("data/sensor_types.py", globals, locals)
+    self.data = locals['SENSOR_TYPES']
+
+  def test_SensorTypeData(self):
+    seen_names = set()
+
+    for sensor_type_id in self.data:
+      name = self.data[sensor_type_id]
+      self.assertEqual(int, type(sensor_type_id))
+      self.assertEqual(str, type(name))
+
+      self.assertNotIn(name, seen_names,
+                       "Sensor Name %s is present twice" % name)
+      seen_names.add(name)
+
+    # check that some sensors exist
+    self.assertGreater(len(seen_names), 30)
+
+
+if __name__ == '__main__':
+  unittest.main()

data/software_test.py

@@ -0,0 +1,47 @@
+#!/usr/bin/python
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Library General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# software_test.py
+# Copyright (C) 2017 Peter Newman
+
+import unittest
+
+class TestSoftwareData(unittest.TestCase):
+  """ Test the software data files are valid."""
+  def setUp(self):
+    globals = {}
+    locals = {}
+    execfile("data/software_data.py", globals, locals)
+    self.data = locals['SOFTWARE_DATA']
+
+  def test_SoftwareData(self):
+    # Check the type
+    self.assertEqual(type(self.data), dict)
+
+    for esta_id in self.data:
+      self.assertEqual(int, type(esta_id))
+      self.assertEqual(list, type(self.data[esta_id]))
+
+      seen_names = set()
+
+      for software in self.data[esta_id]:
+        name = software['name']
+        self.assertNotIn(name, seen_names,
+                         "Name %s for ESTA ID 0x%04x is present twice" % (name, esta_id))
+        seen_names.add(name)
+
+
+if __name__ == '__main__':
+  unittest.main()

data/splitter_test.py

@@ -0,0 +1,47 @@
+#!/usr/bin/python
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Library General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# splitter_test.py
+# Copyright (C) 2017 Peter Newman
+
+import unittest
+
+class TestSplitterData(unittest.TestCase):
+  """ Test the splitter data files are valid."""
+  def setUp(self):
+    globals = {}
+    locals = {}
+    execfile("data/splitter_data.py", globals, locals)
+    self.data = locals['SPLITTER_DATA']
+
+  def test_SplitterData(self):
+    # Check the type
+    self.assertEqual(type(self.data), dict)
+
+    for esta_id in self.data:
+      self.assertEqual(int, type(esta_id))
+      self.assertEqual(list, type(self.data[esta_id]))
+
+      seen_names = set()
+
+      for splitter in self.data[esta_id]:
+        name = splitter['name']
+        self.assertNotIn(name, seen_names,
+                         "Name %s for ESTA ID 0x%04x is present twice" % (name, esta_id))
+        seen_names.add(name)
+
+
+if __name__ == '__main__':
+  unittest.main()