Changeset 84893 in vbox for trunk/src/VBox/ValidationKit/testdriver

Timestamp:

Jun 22, 2020 11:06:48 AM (5 years ago)

Author:

vboxsync

Message:

Validation Kit/testfileset: Limit iterations of chooseRandomDirFromTree() to avoid potential endless loops.

File:

• trunk/src/VBox/ValidationKit/testdriver/testfileset.py (modified) (2 diffs)

trunk/src/VBox/ValidationKit/testdriver/testfileset.py

@@ -618 +618 @@
         return self.aoFiles[self.oRandom.choice(xrange(len(self.aoFiles)))];
 
-    def chooseRandomDirFromTree(self, fLeaf = False, fNonEmpty = False):
+    def chooseRandomDirFromTree(self, fLeaf = False, fNonEmpty = False, cMaxRetries = 1024):
         """
         Returns a random directory from the tree (self.oTreeDir).
         """
-        while True:
+        cRetries = 0;
+        while cRetries < cMaxRetries:
             oDir = self.aoDirs[self.oRandom.choice(xrange(len(self.aoDirs)))];
             # Check fNonEmpty requirement:
@@ -638 +639 @@
                         return oDir;
                     oParent = oParent.oParent;
+            cRetries++;
+
+        reporter.errorXcpt('chooseRandomDirFromTree() failed; cMaxRetries=%d' % (cMaxRetries));
         return None; # make pylint happy