commit 4cd8ac450fd0f3c80a74c4f7835bee1fd2644ef5 Author: Damian Johnson atagar@torproject.org Date: Mon Jan 2 20:39:50 2012 -0800
Making integ test ps query just match 'tor'
The fix in c421b54 checked for endings of 'tor' rather than ' tor', causing things like 'monitor' to be picked up. --- test/integ/util/system.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/test/integ/util/system.py b/test/integ/util/system.py index b255c4a..dc06351 100644 --- a/test/integ/util/system.py +++ b/test/integ/util/system.py @@ -30,7 +30,7 @@ class TestSystem(unittest.TestCase): self.is_extra_tor_running = len(pgrep_results) > 1 else: ps_results = stem.util.system.call(stem.util.system.GET_PID_BY_NAME_PS_BSD) - results = [r for r in ps_results if r.endswith("tor")] + results = [r for r in ps_results if r.endswith(" tor")] self.is_extra_tor_running = len(results) > 1
def tearDown(self):