[tor-commits] [stem/master] Drop integ target prereqs

[atagar at torproject.org]

commit e72da89f4ddee0ca1345fcb7b8b993edef2f35c5
Author: Damian Johnson <atagar at torproject.org>
Date:   Wed Jun 21 10:47:58 2017 -0700

    Drop integ target prereqs
    
    We only had a prereq for a single target, and it was for versions which have
    been obsolete for years. Might as well simply drop this.
---
 run_tests.py      | 22 ----------------------
 stem/version.py   |  5 +++++
 test/settings.cfg |  5 -----
 3 files changed, 5 insertions(+), 27 deletions(-)

diff --git a/run_tests.py b/run_tests.py
index 61f526d..add359e 100755
--- a/run_tests.py
+++ b/run_tests.py
@@ -38,7 +38,6 @@ CONFIG = stem.util.conf.config_dict('test', {
   'integ.test_directory': './test/data',
   'test.unit_tests': '',
   'test.integ_tests': '',
-  'target.prereq': {},
   'target.torrc': {},
 })
 
@@ -257,20 +256,7 @@ def main():
     test.output.print_divider('INTEGRATION TESTS', True)
     integ_runner = test.runner.get_runner()
 
-    # Determine targets we don't meet the prereqs for. Warnings are given about
-    # these at the end of the test run so they're more noticeable.
-
-    skipped_targets = {}
-
     for target in args.run_targets:
-      # check if we meet this target's tor version prerequisites
-
-      target_prereq = CONFIG['target.prereq'].get(target)
-
-      if target_prereq and test.tor_version() < stem.version.Requirement[target_prereq]:
-        skipped_targets[target] = target_prereq
-        continue
-
       error_tracker.set_category(target)
 
       try:
@@ -309,14 +295,6 @@ def main():
 
           break
 
-    if skipped_targets:
-      println()
-
-      for target, req_version in skipped_targets.items():
-        println('Unable to run target %s, this requires tor version %s' % (target, req_version), ERROR)
-
-      println()
-
   static_check_issues = {}
 
   for task in (test.task.PYFLAKES_TASK, test.task.PYCODESTYLE_TASK):
diff --git a/stem/version.py b/stem/version.py
index 6eb9485..b8960a5 100644
--- a/stem/version.py
+++ b/stem/version.py
@@ -26,6 +26,11 @@ easily parsed and compared, for instance...
 
   Enumerations for the version requirements of features.
 
+  .. deprecated:: 1.6.0
+     Requirement entries belonging to tor versions which have been obsolete for
+     at least six months will be removed when we break backward compatibility
+     in the 2.x stem release.
+
   ===================================== ===========
   Requirement                           Description
   ===================================== ===========
diff --git a/test/settings.cfg b/test/settings.cfg
index 7ccd733..4854c24 100644
--- a/test/settings.cfg
+++ b/test/settings.cfg
@@ -75,11 +75,6 @@ target.description RUN_SCOOKIE  => Configuration with a control socket and authe
 target.description RUN_PTRACE   => Configuration with an open control port and 'DisableDebuggerAttachment 0'
 target.description RUN_ALL      => Runs integration tests for all connection configurations.
 
-# Version that we need to run the target. These need to match an enumeration of
-# stem.version.Requirement.
-
-target.prereq RUN_PTRACE => TORRC_DISABLE_DEBUGGER_ATTACHMENT
-
 # Torrc configuration options included with the target. Having this option set
 # means that each of these targets will have a dedicated integration test run.