[tor-commits] [stem/master] Regression when tor_cmd isn't a path

[atagar@xxxxxxxxxxxxxx]

commit 5c2c55012aea1175855d485800587ca5a2cc8aed
Author: Damian Johnson <atagar@xxxxxxxxxxxxxx>
Date:   Wed May 24 13:34:59 2017 -0700

    Regression when tor_cmd isn't a path
    
    Stupid me. By default tor_cmd is just 'tor' so resolving that to an absolute
    path breaks. If presented with a path we want to expand it. If not then we
    should rely on our PATH.
---
 test/runner.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/runner.py b/test/runner.py
index bbaa4aa..9430e82 100644
--- a/test/runner.py
+++ b/test/runner.py
@@ -197,7 +197,7 @@ class Runner(object):
         self._test_dir = tempfile.mktemp('-stem-integ')
 
       original_cwd, data_dir_path = os.getcwd(), self._test_dir
-      self._tor_cmd = os.path.abspath(tor_cmd)
+      self._tor_cmd = stem.util.system.expand_path(tor_cmd) if '/' in tor_cmd else tor_cmd
 
       if test.Target.RELATIVE in self.attribute_targets:
         tor_cwd = os.path.dirname(self._test_dir)

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits