From a247a8ffd2b9c193bde4e00cd26961400942e4c6 Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Sat, 6 Feb 2016 12:30:36 -0500 Subject: [PATCH] Tests: The run_all script was not correctly using exit code 0 when all tests pass --- test/problems | 2 +- test/run_all | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/test/problems b/test/problems index 677a9761..5bacda41 100755 --- a/test/problems +++ b/test/problems @@ -129,4 +129,4 @@ if __name__ == "__main__": print_category(expected) # If we encoutered any failures, return non-zero code - sys.exit(1 if error_int or unexpected_int else 0) + sys.exit(1 if int(error_int) or int(unexpected_int) else 0) diff --git a/test/run_all b/test/run_all index 31ad9d05..a41aa6cb 100755 --- a/test/run_all +++ b/test/run_all @@ -19,6 +19,9 @@ except ImportError: # python 3 from queue import Queue, Empty +# Look for taskd in $PATH instead of task/src/ +os.environ["TASKD_USE_PATH"] = "1" + TIMEOUT = .2 @@ -180,7 +183,7 @@ class TestRunner(object): def parse_args(): - parser = argparse.ArgumentParser(description="Run Timewarrior tests") + parser = argparse.ArgumentParser(description="Run Taskwarrior tests") parser.add_argument('--verbose', '-v', action="store_true", help="Also send TAP output to stdout") parser.add_argument('--logging', '-l', action="count",