CA-332806 - Fix type mismatch when processing speed file

Signed-off-by: ben sims <ben.sims@citrix.com>
xapi-project · Dec 12, 2019 · 25481c2 · 25481c2
1 parent b43525c
commit 25481c2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/drivers/cleanup.py b/drivers/cleanup.py
@@ -1948,7 +1948,13 @@ def getStorageSpeed(self):
             if os.path.isfile(path):
                 speedFile = open(path)
                 content = speedFile.readlines()
-                content = [float(i) for i in content]
+                try:
+                    content = [float(i) for i in content]
+                except exceptions.ValueError:
+                    Util.log("Something bad in the speed log:{log}".
+                             format(log=speedFile.readlines()))
+                    return speed
+
                 if len(content):
                     speed = sum(content)/float(len(content))
                     if speed <= 0:

diff --git a/tests/test_cleanup.py b/tests/test_cleanup.py
@@ -967,6 +967,10 @@ def test_getStorageSpeed(self, mock_chmod, mock_isFile, mock_open):
         self.getStorageSpeed(mock_isFile, sr, fakeFile, True, 3.0, 1,
                              lines=[1.0, 2.0, 6.0])
 
+        # File exists contains, a string
+        self.getStorageSpeed(mock_isFile, sr, fakeFile, True, None, 1,
+                             lines=[1.0, 2.0, "Hello"])
+
     def speedFileSetup(self, sr, FakeFile, mock_isFile, isFile):
         expectedPath = cleanup.SPEED_LOG_ROOT.format(uuid=sr.uuid)
         mock_isFile.return_value = isFile