gergely/taskwarrior-2.x
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Merge branch '2.4.4' of ssh://git.tasktools.org/tm/task into 2.4.4

Browse Source
This commit is contained in:
Paul Beckingham
2015-04-26 13:29:13 -04:00
parent 8e01976abb e60ea2e07a
commit 93470bb8d8
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
test/basetest/README
View File

@@ -2,4 +2,5 @@ Shell environment variables that affect how and what tests are executed:
TASKW_SKIP -> Causes any test that needs Taskwarrior (task binary) to be skipped TASKW_SKIP -> Causes any test that needs Taskwarrior (task binary) to be skipped
TASKD_SKIP -> Causes any test that needs Task Server (taskd binary) to be skipped TASKD_SKIP -> Causes any test that needs Task Server (taskd binary) to be skipped
USE_PATH -> Causes tests to look for "task" and "taskd" in PATH instead of the default location TASK_USE_PATH -> Causes tests to look for "task" in PATH instead of the default location
TASKD_USE_PATH -> Causes tests to look for "taskd" in PATH instead of the default location

2
test/basetest/taskd.py
View File

@@ -39,7 +39,7 @@ class Taskd(object):
TASKD_NOT_LISTENING = 3 TASKD_NOT_LISTENING = 3
def __init__(self, taskd=DEFAULT_TASKD, certpath=None, def __init__(self, taskd=DEFAULT_TASKD, certpath=None,
address="127.0.0.1"): address="localhost"):
"""Initialize a Task server that runs in the background and stores data """Initialize a Task server that runs in the background and stores data
in a temporary folder in a temporary folder

10
test/basetest/utils.py
View File

@@ -129,9 +129,9 @@ def _queue_output(arguments, pidq, outputq):
outputq.put(( outputq.put((
"", "",
("Unexpected exception caught during execution of taskw: '{0}' . " ("Unexpected exception caught during execution of taskw: '{0}' . "
"If you are running out-of-tree tests set USE_PATH=1 in shell " "If you are running out-of-tree tests set TASK_USE_PATH=1 or "
"env before execution and add the location of the task(d) binary " "TASKD_USE_PATH=1 in shell env before execution and add the "
"to the PATH".format(e)), "location of the task(d) binary to the PATH".format(e)),
255)) # false exitcode 255)) # false exitcode
return return
@@ -279,7 +279,7 @@ def get_IPs(hostname):
return output return output
def port_used(addr="127.0.0.1", port=None): def port_used(addr="localhost", port=None):
"Return True if port is in use, False otherwise" "Return True if port is in use, False otherwise"
if port is None: if port is None:
raise TypeError("Argument 'port' may not be None") raise TypeError("Argument 'port' may not be None")
@@ -304,7 +304,7 @@ def port_used(addr="127.0.0.1", port=None):
return False return False
def find_unused_port(addr="127.0.0.1", start=53589, track=True): def find_unused_port(addr="localhost", start=53589, track=True):
"""Find an unused port starting at `start` port """Find an unused port starting at `start` port
If track=False the returned port will not be marked as in-use and the code If track=False the returned port will not be marked as in-use and the code