Changes in tests/pybin/tools.py [f806b61:a45fc7b]

File:

• tests/pybin/tools.py (modified) (6 diffs)

tests/pybin/tools.py

@@ -11 +11 @@
 import subprocess
 import sys
-import tempfile
 import time
 import types
 
 from pybin import settings
+from subprocess import Popen, PIPE, STDOUT
 
 ################################################################################
@@ -27 +27 @@
         # if this is a dry_run, only print the commands that would be ran
         if settings.dry_run :
-                cmd = "{} cmd: {}".format(os.getcwd(), ' '.join(cmd))
-                if output and not isinstance(output, int):
-                        cmd += " > "
-                        cmd += output
-
-                if error and not isinstance(error, int):
-                        cmd += " 2> "
-                        cmd += error
-
-                if input and not isinstance(input, int) and os.path.isfile(input):
-                        cmd += " < "
-                        cmd += input
-
-                print(cmd)
+                print("cmd: %s" % ' '.join(cmd))
                 return 0, None
 
         with contextlib.ExitStack() as onexit:
                 # add input redirection if needed
-                input = openfd(input, 'r', onexit, True)
+                if input and input != subprocess.DEVNULL:
+                        if os.path.isfile(input):
+                                input = open(input)
+                                onexit.push(input)
+                        else:
+                                input = None
 
                 # add output redirection if needed
-                output = openfd(output, 'w', onexit, False)
-
-                # add error redirection if needed
-                error = openfd(error, 'w', onexit, False)
+                if output and output != subprocess.DEVNULL and output != subprocess.PIPE:
+                        output = open(output, 'w')
+                        onexit.push(output)
 
                 # run the desired command
@@ -59 +50 @@
                                 stdin =input,
                                 stdout=output,
-                                stderr=error,
+                                stderr=STDOUT,
                                 timeout=settings.timeout.single if timeout else None
                         )
@@ -87 +78 @@
 def is_exe(fname):
         return os.path.isfile(fname) and os.access(fname, os.X_OK)
-
-def openfd(file, mode, exitstack, checkfile):
-        if not file:
-                return file
-
-        if isinstance(file, int):
-                return file
-
-        if checkfile and not os.path.isfile(file):
-                return None
-
-        file = open(file, mode)
-        exitstack.push(file)
-        return file
 
 # Remove 1 or more files silently
@@ -169 +146 @@
     return None
 
-@contextlib.contextmanager
-def tempdir():
-        cwd = os.getcwd()
-        with tempfile.TemporaryDirectory() as temp:
-                os.chdir(temp)
-                try:
-                        yield temp
-                finally:
-                        os.chdir(cwd)
-
 ################################################################################
 #               file handling
@@ -279 +246 @@
 
 def core_info(path):
-        if not os.path.isfile(path):
-                return 1, "ERR Executable path is wrong"
-
         cmd   = os.path.join(settings.SRCDIR, "pybin/print-core.gdb")
         if not os.path.isfile(cmd):
                 return 1, "ERR Printing format for core dumps not found"
 
-        core  = os.path.join(os.getcwd(), "core" )
+        dname = os.path.dirname(path)
+        core  = os.path.join(dname, "core" )
+        if not os.path.isfile(path):
+                return 1, "ERR Executable path is wrong"
 
         if not os.path.isfile(core):