Changeset 96558 in vbox

Timestamp:

Aug 30, 2022 6:26:47 PM (3 years ago)

Author:

vboxsync

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

153426

Message:

ValKit/testdriver: Screen recording corrections. We do those upload last because they will usually be bigger and therefore more likely to cause trouble, so lets get the other logs up first. Noticed we have two --vbox-always-upload-xxxx options, so changed --vbox-recording-force-upload to --vbox-always-upload-recordings to fit better in. bugref:8733

Location:

trunk/src/VBox/ValidationKit/testdriver

Files:

• reporter.py (modified) (1 diff)
• vbox.py (modified) (9 diffs)

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

@@ -965 +965 @@
             finally:
                 g_oLock.acquire();
-        elif sKind.startswith('video/'):
+        elif sKind.startswith('screenrecording/'):
             self.log(0, '*** Uploading "%s" - KIND: "%s" - DESC: "%s" ***'
                         % (sSrcFilename, sKind, sDescription),  sCaller, sTsPrf);

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

@@ -902 +902 @@
         self.fAlwaysUploadLogs  = False;
         self.fAlwaysUploadScreenshots = False;
+        self.fAlwaysUploadRecordings  = False; # Only upload recording files on failure by default.
         self.fEnableDebugger          = True;
-        self.aRecordingFiles          = [];
+        self.adRecordingFiles         = [];
         self.fRecordingEnabled        = False; # Don't record by default (yet).
         self.fRecordingAudio          = False; # Don't record audio by default.
-        self.fRecordingForceUpload    = False; # Only upload recording files on failure by default.
         self.cSecsRecordingMax        = 0;     # No recording time limit in seconds.
         self.cMbRecordingMax          = 0;     # No recording size limit in MiBs.
@@ -1800 +1800 @@
         reporter.log('  --vbox-always-upload-screenshots');
         reporter.log('      Whether to always upload final screen shots, or only do so on failure.');
+        reporter.log('  --vbox-always-upload-recordings, --no-vbox-always-upload-recordings');
+        reporter.log('      Whether to always upload recordings, or only do so on failure.');
+        reporter.log('      Default: --no-vbox-always-upload-recordings');
         reporter.log('  --vbox-debugger, --no-vbox-debugger');
         reporter.log('      Enables the VBox debugger, port at 5000');
@@ -1809 +1812 @@
         reporter.log('      Enables/disables audio recording.');
         reporter.log('      Default: --no-vbox-recording-audio');
-        reporter.log('  --vbox-recording-force-upload, --no-vbox-recording-force-upload');
-        reporter.log('      Force uploading recordings or only upload them on test failure.');
-        reporter.log('      Default: --no-vbox-recording-force-upload');
         reporter.log('  --vbox-recording-max-time <seconds>');
         reporter.log('      Limits the maximum recording time in seconds.');
@@ -1922 +1922 @@
         elif asArgs[iArg] == '--vbox-always-upload-screenshots':
             self.fAlwaysUploadScreenshots = True;
+        elif asArgs[iArg] == '--no-vbox-always-upload-recordings':
+            self.fAlwaysUploadRecordings = False;
+        elif asArgs[iArg] == '--vbox-always-upload-recordings':
+            self.fAlwaysUploadRecordings = True;
         elif asArgs[iArg] == '--vbox-debugger':
             self.fEnableDebugger = True;
@@ -1934 +1938 @@
         elif asArgs[iArg] == '--vbox-recording-audio':
             self.fRecordingAudio = True;
-        elif asArgs[iArg] == '--no-vbox-recording-force-upload':
-            self.fRecordingForceUpload = False;
-        elif asArgs[iArg] == '--vbox-recording-force-upload':
-            self.fRecordingForceUpload = True;
         elif asArgs[iArg] == '--vbox-recording-max-time':
             iArg += 1;
@@ -2564 +2564 @@
                                 oScreen.filename = sRecFile;
                                 sRecFile = oScreen.filename; # Get back the file from Main, in case it was modified somehow.
-                                oRecFile = { "id" : oScreen.id, "file" : sRecFile };
-                                self.aRecordingFiles.append(oRecFile);
+                                dRecFile = { 'id' : oScreen.id, 'file' : sRecFile };
+                                self.adRecordingFiles.append(dRecFile);
                                 if self.fpApiVer >= 7.0:
-                                    aFeatures = [ vboxcon.RecordingFeature_Video ];
+                                    aFeatures = [ vboxcon.RecordingFeature_Video, ];
                                     if self.fRecordingAudio:
                                         aFeatures.append(vboxcon.RecordingFeature_Audio);
@@ -2579 +2579 @@
                                         uFeatures = uFeatures | vboxcon.RecordingFeature_Audio;
                                     oScreen.features = uFeatures;
-                                reporter.log2('Recording screen %d to "%s"' % (oRecFile['id'], oRecFile['file']));
+                                reporter.log2('Recording screen %d to "%s"' % (dRecFile['id'], dRecFile['file'],));
                                 oScreen.maxTime     = self.cSecsRecordingMax;
                                 oScreen.maxFileSize = self.cMbRecordingMax;
@@ -3439 +3439 @@
                 reporter.addLogFile(sLastScreenshotPath, 'screenshot/success', 'Last VM screenshot');
 
-        # Add produced recording files (if any) to the log files to be uploaded.
-        if reporter.testErrorCount() > 0 \
-        or self.fRecordingForceUpload: # By default we only upload WebM file on failures, to save some space.
-            for oRecFile in self.aRecordingFiles:
-                reporter.addLogFile(oRecFile['file'], 'video/webm', 'Recording of screen #%d' % (oRecFile['id'],));
-
         # Add the guest OS log if it has been requested and taken successfully.
         if sOsKernelLog is not None:
@@ -3482 +3476 @@
                     except: pass; # paranoia
 
+        # Upload the screen video recordings if appropriate.
+        if self.fAlwaysUploadRecordings or reporter.testErrorCount() > 0:
+            for dRecFile in self.adRecordingFiles:
+                reporter.addLogFile(dRecFile['file'],
+                                    'screenrecording/failure' if reporter.testErrorCount() > 0 else 'screenrecording/success',
+                                    'Recording of screen #%d' % (dRecFile['id'],));
 
         return fRc;