[tor-commits] [stem/master] Drop unused run_target from test runner

atagar at torproject.org atagar at torproject.org
Mon May 22 18:30:29 UTC 2017


commit 08c290474d9f78c87016420458e2f4e517975c16
Author: Damian Johnson <atagar at torproject.org>
Date:   Tue May 9 10:51:22 2017 -0700

    Drop unused run_target from test runner
    
    Our Runner class provided a run_target attribute but nothing used it. This is
    because testing requirements are against the torrc instead.
---
 run_tests.py   | 2 +-
 test/runner.py | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/run_tests.py b/run_tests.py
index fc6d906..f4f49c0 100755
--- a/run_tests.py
+++ b/run_tests.py
@@ -233,7 +233,7 @@ def main():
       error_tracker.set_category(target)
 
       try:
-        integ_runner.start(target, args.attribute_targets, args.tor_path, extra_torrc_opts = test.util.get_torrc_entries(target))
+        integ_runner.start(args.attribute_targets, args.tor_path, extra_torrc_opts = test.util.get_torrc_entries(target))
 
         println('Running tests...\n', STATUS)
 
diff --git a/test/runner.py b/test/runner.py
index 69af65d..4b4d29d 100644
--- a/test/runner.py
+++ b/test/runner.py
@@ -147,7 +147,6 @@ class _MockChrootFile(object):
 
 class Runner(object):
   def __init__(self):
-    self.run_target = None
     self.attribute_targets = []
 
     self._runner_lock = threading.RLock()
@@ -166,12 +165,11 @@ class Runner(object):
 
     self._original_recv_message = None
 
-  def start(self, run_target, attribute_targets, tor_cmd, extra_torrc_opts):
+  def start(self, attribute_targets, tor_cmd, extra_torrc_opts):
     """
     Makes temporary testing resources and starts tor, blocking until it
     completes.
 
-    :param Target run_target: configuration we're running with
     :param list attribute_targets: **Targets** for our non-configuration attributes
     :param str tor_cmd: command to start tor with
     :param list extra_torrc_opts: additional torrc options for our test instance
@@ -180,7 +178,6 @@ class Runner(object):
     """
 
     with self._runner_lock:
-      self.run_target = run_target
       self.attribute_targets = attribute_targets
 
       # if we're holding on to a tor process (running or not) then clean up after





More information about the tor-commits mailing list