Changeset 69577 in vbox

Timestamp:

Nov 4, 2017 10:19:04 AM (7 years ago)

Author:

vboxsync

Message:

testdriver: dropped the heap checks.

Location:

trunk/src/VBox/ValidationKit

Files:

• testdriver/vbox.py (modified) (10 diffs)
• tests/installation/tdGuestOsInstOs2.py (modified) (1 diff)

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

@@ -816 +816 @@
         self.fEnableDebugger          = True;
 
-        # TEMPORARY: For process heap checking on windows 2012 boxes.
-        self.fDoHeapChecks = False;
-        if 'COMPUTERNAME' in os.environ and utils.getHostOs() == 'win':
-            self.fDoHeapChecks = os.environ['COMPUTERNAME'] in [ 'TESTBOXWIN5', 'WEI01-B6KC-4', 'TESTBOXPILE2', 'SKYLAKE' ];
-            if self.fDoHeapChecks:
-                reporter.log('Will do heap checking...');
-
         # Quietly detect build and validation kit.
         self._detectBuild(False);
@@ -849 +842 @@
         if self.oBuild is not None:
             self.oBuild.dump();
-
-
-    def checkProcessHeap(self):
-        """
-        TEMPORARY: Check the process heap on some Windows 2012 server machines to try catch heap corruption issue.
-        """
-        if self.fDoHeapChecks:
-            if sys.platform == 'win32':
-                from testdriver import winbase;
-                return winbase.checkProcessHeap();
-        return True;
 
 
@@ -1454 +1436 @@
         self.oVBox            = None;
         vboxcon.goHackModuleClass.oVBoxMgr = None; # VBoxConstantWrappingHack.
-        self.checkProcessHeap(); ## TEMPORARY
 
         # Do garbage collection to try get rid of those objects.
@@ -1462 +1443 @@
             reporter.logXcpt();
         self.fImportedVBoxApi = False;
-        self.checkProcessHeap(); ## TEMPORARY
 
         # Check whether the python is still having any COM objects/interfaces around.
@@ -1526 +1506 @@
             except:
                 reporter.logXcpt();
-        self.checkProcessHeap(); ## TEMPORARY
 
         # Try get the referrers to (XP)COM interfaces and objects that was left behind.
@@ -1574 +1553 @@
         except:
             reporter.logXcpt();
-        self.checkProcessHeap(); ## TEMPORARY
         return True;
 
@@ -1942 +1920 @@
         Only Ctrl-C exception, no return.
         """
-        self.checkProcessHeap(); ## TEMPORARY
         try:
             self.oVBoxMgr.waitForEvents(cMsTimeout);
@@ -1949 +1926 @@
         except:
             pass;
-        self.checkProcessHeap(); ## TEMPORARY
         return None;
 
@@ -2232 +2208 @@
         if not self.importVBoxApi():
             return None;
-        self.checkProcessHeap(); ## TEMPORARY
 
         # create + register the VM
@@ -2343 +2318 @@
         reporter.log('created "%s" with name "%s"' % (oVM.id, sName));
         self.aoVMs.append(oVM);
-        self.checkProcessHeap(); ## TEMPORARY
         self.logVmInfo(oVM); # testing...
-        self.checkProcessHeap(); ## TEMPORARY
         return oVM;
     # pylint: enable=R0913,R0914,R0915

trunk/src/VBox/ValidationKit/tests/installation/tdGuestOsInstOs2.py

@@ -246 +246 @@
 
 if __name__ == '__main__':
-    # sys.exit(tdGuestOsInstOs2().main(sys.argv);
-    # TEMPORARY hacking.
-    g_oDrv = tdGuestOsInstOs2();
-    g_iExitCode = g_oDrv.main(sys.argv);
-    if g_oDrv.fDoHeapChecks:
-        from testdriver import winbase;
-        winbase.checkProcessHeap();
-        del g_oDrv;
-        g_oDrv = None;
-        winbase.checkProcessHeap();
-        #import gc;
-        #for oObj in gc.get_objects():
-        #    if not callable(oObj):
-        #        reporter.log('type %s: object %s' % (type(oObj), oObj));
-
-    sys.exit(g_iExitCode);
-
+    sys.exit(tdGuestOsInstOs2().main(sys.argv);
+