Changeset 78636 in vbox for trunk/src/VBox

Timestamp:

May 21, 2019 2:56:45 PM (6 years ago)

Author:

vboxsync

Message:

tdAddGuestCtrl.py: The nice to have 'all' option value is evaluated too early.

File:

• trunk/src/VBox/ValidationKit/tests/additions/tdAddGuestCtrl.py (modified) (1 diff)

trunk/src/VBox/ValidationKit/tests/additions/tdAddGuestCtrl.py

@@ -962 +962 @@
         if asArgs[iArg] == '--add-guest-ctrl-tests':
             iArg += 1;
+            iNext = self.oTstDrv.requireMoreArgs(1, asArgs, iArg);
             if asArgs[iArg] == 'all': # Nice for debugging scripts.
                 self.asTests = self.asTestsDef;
-                return iArg + 1;
-
-            iNext = self.oTstDrv.requireMoreArgs(1, asArgs, iArg);
-            self.asTests = asArgs[iArg].split(':');
-            for s in self.asTests:
-                if s not in self.asTestsDef:
-                    raise base.InvalidOption('The "--add-guest-ctrl-tests" value "%s" is not valid; valid values are: %s' \
-                        % (s, ' '.join(self.asTestsDef)));
+            else:
+                self.asTests = asArgs[iArg].split(':');
+                for s in self.asTests:
+                    if s not in self.asTestsDef:
+                        raise base.InvalidOption('The "--add-guest-ctrl-tests" value "%s" is not valid; valid values are: %s'
+                                                 % (s, ' '.join(self.asTestsDef)));
             return iNext;
         return iArg;