Changeset 71153 in vbox for trunk/src/VBox/ValidationKit

Timestamp:

Feb 28, 2018 2:47:23 PM (7 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

121048

Message:

vsc_import.py,vscrevisions.py: Fixed encoding regression from r120255; truncate big commit messages so we don't choke on them during database input validation.

Location:

trunk/src/VBox/ValidationKit/testmanager

Files:

• batch/vcs_import.py (modified) (2 diffs)
• core/vcsrevisions.py (modified) (1 diff)

trunk/src/VBox/ValidationKit/testmanager/batch/vcs_import.py

@@ -118 +118 @@
         # Parse the XML and add the entries to the database.
         oParser = ET.XMLParser(target = ET.TreeBuilder(), encoding = 'utf-8');
-        oParser.feed(sLogXml);
+        oParser.feed(sLogXml.encode('utf-8')); # does its own decoding and processOutputChecked always gives us decoded utf-8 now.
         oRoot = oParser.close();
 
@@ -128 +128 @@
             if sMessage == '':
                 sMessage = ' ';
+            elif len(sMessage) > VcsRevisionData.kcchMax_sMessage:
+                sMessage = sMessage[:VcsRevisionData.kcchMax_sMessage - 4] + ' ...';
             if not self.oConfig.fQuiet:
                 print('sDate=%s iRev=%u sAuthor=%s sMsg[%s]=%s' % (sDate, iRevision, sAuthor, type(sMessage).__name__, sMessage));

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

@@ -52 +52 @@
     kasAllowNullAttributes      = [ ];
     kfAllowUnicode_sMessage     = True;
+    kcchMax_sMessage            = 8192;
 
     def __init__(self):