Revision: 3247
Author: jussi.ao.malinen
Date: Mon May 10 03:59:07 2010
Log: Cleaned code up on test library.
http://code.google.com/p/robotframework/source/detail?r=3247

Modified:
 /trunk/atest/robot/running/ProcessManager.py

=======================================
--- /trunk/atest/robot/running/ProcessManager.py        Mon May 10 01:27:04 2010
+++ /trunk/atest/robot/running/ProcessManager.py        Mon May 10 03:59:07 2010
@@ -9,7 +9,6 @@

     def __init__(self):
         self._process = None
-        self._output_read = False
         self._stdout = ''
         self._stderr = ''

@@ -17,14 +16,9 @@
         args = args[0].split() + list(args[1:])
         self._process = subprocess.Popen(args, stderr=subprocess.PIPE,
                                          stdout=subprocess.PIPE)
-        self._output_read = False
         self._stdout = ''
         self._stderr = ''

-    def returncode(self):
-        self._process.poll()
-        return self._process.returncode
-
     def send_terminate(self, signal_name):
         if os.name != 'nt':
             os.kill(self._process.pid, getattr(signal, signal_name))
@@ -46,9 +40,8 @@
         return self._stderr

     def wait_until_finished(self):
-        if not self._output_read:
-            self._stdout,self._stderr = self._process.communicate()
-            self._output_read = True
+        if self._process.returncode is None:
+            self._stdout, self._stderr = self._process.communicate()

     def busy_sleep(self, seconds):
         max_time = time.time() + int(seconds)

Reply via email to