define PLC_MAIL_FROM_ADDRESS

[tests.git] / qaapi / qa / Remote.py

diff --git a/qaapi/qa/Remote.py b/qaapi/qa/Remote.py
index 42b9ed2..b904533 100644 (file)
--- a/qaapi/qa/Remote.py
+++ b/qaapi/qa/Remote.py
@@ -24,7 +24,7 @@ class Remote:
 
         # Execute vserver exec if necessary
         if 'vserver' in self and self['vserver']:
-            command = " vserver %s exec %s " % (self['vserver'], command)
+            command = "/usr/sbin/vserver %s exec %s " % (self['vserver'], command)
        
        return command
 
@@ -139,17 +139,23 @@ class VRemote(Remote):
         return command
 
     # Host remote commands
-    def host_popen(self, command, fatal = True):
+    def host_popen(self, command, fatal = True, logfile = None):
+       if logfile is None:
+           logfile = self.logfile
         command = self.get_host_command(command)
-        return utils.popen(command, fatal, self.config.verbose, self.logfile)
+        return utils.popen(command, fatal, self.config.verbose, logfile)
 
-    def host_popen3(self, command):
+    def host_popen3(self, command, logfile = None):
+       if logfile is None:
+           logfile = self.logfile
         command = self.get_host_command(command)
-        return utils.popen3(command, self.config.verbose, self.logfile)
+        return utils.popen3(command, self.config.verbose, logfile)
 
-    def host_commands(self, command, fatal = True):
+    def host_commands(self, command, fatal = True, logfile = None):
+       if logfile is None:
+           logfiile = self.logfile
         command = self.get_host_command(command)
-        return utils.commands(command, fatal, self.config.verbose, self.logfile)
+        return utils.commands(command, fatal, self.config.verbose, logfile)
 
     # Slice remote commands
     def slice_popen(self, command, user = 'root', key = None, fatal = True):