Changeset 65230 in vbox for trunk/src/VBox/ValidationKit/testdriver/base.py

Timestamp:

Jan 10, 2017 4:07:42 PM (8 years ago)

Author:

vboxsync

Message:

testdriver: Implemented sudo kill for aborting VM processes.

File:

• trunk/src/VBox/ValidationKit/testdriver/base.py (modified) (6 diffs)

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

@@ -178 +178 @@
     return sName;
 
-def processInterrupt(uPid):
+def __processSudoKill(uPid, iSignal, fSudo):
+    """
+    Does the sudo kill -signal pid thing if fSudo is true, else uses os.kill.
+    """
+    try:
+        if fSudo:
+            return utils.sudoProcessCall(['/bin/kill', '-%s' % (iSignal,), str(uPid)]) == 0;
+        os.kill(uPid, iSignal);
+        return True;
+    except:
+        reporter.logXcpt('uPid=%s' % (uPid,));
+    return False;
+
+def processInterrupt(uPid, fSudo = False):
     """
     Sends a SIGINT or equivalent to interrupt the specified process.
@@ -189 +202 @@
         fRc = winbase.processInterrupt(uPid)
     else:
-        try:
-            os.kill(uPid, signal.SIGINT);
-            fRc = True;
-        except:
-            reporter.logXcpt('uPid=%s' % (uPid,));
-            fRc = False;
+        fRc = __processSudoKill(uPid, signal.SIGINT, fSudo);
     return fRc;
 
-def sendUserSignal1(uPid):
+def sendUserSignal1(uPid, fSudo = False):
     """
     Sends a SIGUSR1 or equivalent to nudge the process into shutting down
@@ -209 +217 @@
         fRc = False;
     else:
-        try:
-            os.kill(uPid, signal.SIGUSR1); # pylint: disable=E1101
-            fRc = True;
-        except:
-            reporter.logXcpt('uPid=%s' % (uPid,));
-            fRc = False;
+        fRc = __processSudoKill(uPid, signal.SIGUSR1, fSudo); # pylint: disable=E1101
     return fRc;
 
-def processTerminate(uPid):
+def processTerminate(uPid, fSudo = False):
     """
     Terminates the process in a nice manner (SIGTERM or equivalent).
@@ -226 +229 @@
         fRc = winbase.processTerminate(uPid);
     else:
-        try:
-            os.kill(uPid, signal.SIGTERM);
-            fRc = True;
-        except:
-            reporter.logXcpt('uPid=%s' % (uPid,));
+        fRc = __processSudoKill(uPid, signal.SIGTERM, fSudo);
     return fRc;
 
-def processKill(uPid):
+def processKill(uPid, fSudo = False):
     """
     Terminates the process with extreme prejudice (SIGKILL).
@@ -242 +241 @@
         fRc = winbase.processKill(uPid);
     else:
-        try:
-            os.kill(uPid, signal.SIGKILL); # pylint: disable=E1101
-            fRc = True;
-        except:
-            reporter.logXcpt('uPid=%s' % (uPid,));
+        fRc = __processSudoKill(uPid, signal.SIGKILL, fSudo); # pylint: disable=E1101
     return fRc;
 
@@ -1536 +1531 @@
             afnMethods = [ sendUserSignal1, processInterrupt, processTerminate, processKill ];
         for fnMethod in afnMethods:
-            ## @todo Handle SUDO processes.
             for iPid in dPids:
-                fnMethod(iPid);
+                fnMethod(iPid, fSudo = dPids[iPid][1]);
 
             for i in range(10):