commit 39672342bf81a5de15f40fe78a3170673f4035de Author: Damian Johnson atagar@torproject.org Date: Sun Jan 29 13:36:27 2012 -0800

Renaming version requirements to be hierarchical

Including a prefix with all version requirements for the option's catagory. Currently this includes GETINFO_* and TORRC_*. --- stem/version.py | 8 ++++---- test/settings.cfg | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/stem/version.py b/stem/version.py index e5b9997..74ca8f2 100644 --- a/stem/version.py +++ b/stem/version.py @@ -23,7 +23,7 @@ import re import stem.util.enum import stem.util.system

-# cache for the get_tor_version function +# cache for the get_system_tor_version function VERSION_CACHE = {}

def get_system_tor_version(tor_cmd = "tor"): @@ -141,8 +141,8 @@ class Version: return 0

Requirement = stem.util.enum.Enum( - ("GETINFO_CONFIG_TEXT", Version("0.2.2.7-alpha")), - ("CONTROL_SOCKET", Version("0.2.0.30")), - ("DISABLE_DEBUGGER_ATTACHMENT", Version("0.2.3.9")), + ("GETINFO_CONFIG_TEXT", Version("0.2.2.7")), + ("TORRC_CONTROL_SOCKET", Version("0.2.0.30")), + ("TORRC_DISABLE_DEBUGGER_ATTACHMENT", Version("0.2.3.9")), )

diff --git a/test/settings.cfg b/test/settings.cfg index e004a98..b55dc7e 100644 --- a/test/settings.cfg +++ b/test/settings.cfg @@ -58,7 +58,7 @@ target.description RUN_ALL => Runs integration tests for all connection con # Version that we need to run the target. These need to match an enumeration of # stem.version.Requirement.

-target.prereq RUN_PTRACE => DISABLE_DEBUGGER_ATTACHMENT +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.