Changeset 65335 in vbox for trunk/src/VBox/ValidationKit/testmanager

Timestamp:

Jan 16, 2017 2:01:48 PM (8 years ago)

Author:

vboxsync

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

112914

Message:

testmanager,testdriver: Adjustments of process info dumping. Don't do it if we're low on memory (gdb uses lots of memory!). Changed the kind from 'log/host/vmprocess' to 'process/report/vm' to better fit with the rest. processGetInfo needs a parameter indicating whether or not to try sudo the operations.

Location:

trunk/src/VBox/ValidationKit/testmanager/core

Files:

• testboxcontroller.py (modified) (2 diffs)
• testresults.py (modified) (2 diffs)

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

@@ -46 +46 @@
 from testmanager.core.testboxstatus     import TestBoxStatusData, TestBoxStatusLogic;
 from testmanager.core.testbox           import TestBoxData, TestBoxLogic;
-from testmanager.core.testresults       import TestResultLogic;
+from testmanager.core.testresults       import TestResultLogic, TestResultFileData;
 from testmanager.core.testset           import TestSetData, TestSetLogic;
 from testmanager.core.systemlog         import SystemLogData, SystemLogLogic;
@@ -704 +704 @@
             raise TestBoxControllerException('Invalid MIME type "%s"' % (sMime,));
 
-        if sKind not in [ 'log/release/vm',
-                          'log/debug/vm',
-                          'log/release/svc',
-                          'log/debug/svc',
-                          'log/release/client',
-                          'log/debug/client',
-                          'log/installer',
-                          'log/uninstaller',
-                          'log/guest/kernel',
-                          'log/host/vmprocess',
-                          'crash/report/vm',
-                          'crash/dump/vm',
-                          'crash/report/svc',
-                          'crash/dump/svc',
-                          'crash/report/client',
-                          'crash/dump/client',
-                          'info/collection',
-                          'info/vgatext',
-                          'misc/other',
-                          'screenshot/failure',
-                          'screenshot/success',
-                          #'screencapture/failure',
-                          ]:
+        if sKind not in TestResultFileData.kasKinds:
             raise TestBoxControllerException('Invalid kind "%s"' % (sKind,));
 

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

@@ -401 +401 @@
     ksKind_LogUninstaller       = 'log/uninstaller';
     ksKind_LogGuestKernel       = 'log/guest/kernel';
-    ksKind_LogHostVmProcess     = 'log/host/vmprocess';
+    ksKind_ProcessReportVm      = 'process/report/vm';
     ksKind_CrashReportVm        = 'crash/report/vm';
     ksKind_CrashDumpVm          = 'crash/dump/vm';
@@ -413 +413 @@
     ksKind_ScreenshotFailure    = 'screenshot/failure';
     ksKind_ScreenshotSuccesss   = 'screenshot/success';
-    #kSkind_ScreenCaptureFailure = 'screencapture/failure';
+    #kskind_ScreenCaptureFailure = 'screencapture/failure';
     ## @}
+
+    kasKinds = [
+        ksKind_LogReleaseVm,
+        ksKind_LogDebugVm,
+        ksKind_LogReleaseSvc,
+        ksKind_LogRebugSvc,
+        ksKind_LogReleaseClient,
+        ksKind_LogDebugClient,
+        ksKind_LogInstaller,
+        ksKind_LogUninstaller,
+        ksKind_LogGuestKernel,
+        ksKind_ProcessReportVm,
+        ksKind_CrashReportVm,
+        ksKind_CrashDumpVm,
+        ksKind_CrashReportSvc,
+        ksKind_CrashDumpSvc,
+        ksKind_CrashReportClient,
+        ksKind_CrashDumpClient,
+        ksKind_InfoCollection,
+        ksKind_InfoVgaText,
+        ksKind_MiscOther,
+        ksKind_ScreenshotFailure,
+        ksKind_ScreenshotSuccesss,
+        #kskind_ScreenCaptureFailure,
+    ];
 
     kasAllowNullAttributes      = [ 'idTestSet', ];