Changeset 84498 in vbox

Timestamp:

May 25, 2020 1:00:24 PM (5 years ago)

Author:

vboxsync

Message:

TestManager/*base.py: Tweaked the month validation for relative timestamps from the xxxx-ago combo box.

Location:

trunk/src/VBox/ValidationKit/testmanager

Files:

• core/base.py (modified) (2 diffs)
• webui/wuibase.py (modified) (1 diff)

trunk/src/VBox/ValidationKit/testmanager/core/base.py

@@ -616 +616 @@
 
     @staticmethod
-    def validateTs(sValue, aoNilValues = tuple([None, '']), fAllowNull = True):
+    def validateTs(sValue, aoNilValues = tuple([None, '']), fAllowNull = True, fRelative = False):
         """ Validates a timestamp field. """
         if sValue in aoNilValues:
@@ -653 +653 @@
                 iHour  = int(oRes.group(4));
                 iSec   = int(oRes.group(5));
-                if iMonth > 12 or iMonth <= 0:
+                if iMonth > 12 or (iMonth <= 0 and not fRelative):
                     sError = 'Invalid timestamp month.';
                 elif iDay > acDaysOfMonth[iMonth - 1]:

trunk/src/VBox/ValidationKit/testmanager/webui/wuibase.py

@@ -634 +634 @@
         #
         chSign = sValue[0];
-        (sValue, sError) = ModelDataBase.validateTs(sValue[1:]);
+        (sValue, sError) = ModelDataBase.validateTs(sValue[1:], fRelative = True);
         if sError is not None:
             raise WuiException('%s parameter "%s" ("%s") is invalid: %s' % (self._sAction, sName, sValue, sError));