# HG changeset patch # User Boris Feld <boris.feld@octobus.net> # Date 1544632588 0 # Wed Dec 12 16:36:28 2018 +0000 # Node ID 194a739a612af1439a465a27e0e8d9b487a403d4 # Parent 9fa3e4084371c9b8f3651cf7cc87960172babfb6 Update override environment variable before introduction of a new task type The new task type will use a separate environment variable for testing purpose. diff --git a/scheduler.py b/scheduler.py --- a/scheduler.py +++ b/scheduler.py @@ -24,9 +24,10 @@ from os.path import dirname, join, abspath -DEFAULT_SCRIPT = abspath(join(dirname(__file__), "main-run.sh")) +DEFAULT_RUN_SCRIPT = abspath(join(dirname(__file__), "main-run.sh")) -SCRIPT = os.environ.get("SCHEDULER_TEST_SCRIPT", DEFAULT_SCRIPT) +RUN_SCRIPT = os.environ.get("SCHEDULER_TEST_RUN_SCRIPT", DEFAULT_RUN_SCRIPT) + LOGGER = logging.getLogger(__name__) LOG_FORMAT = "[%(asctime)s] %(message)s" @@ -41,7 +42,7 @@ def run(task): splitted = shlex.split(task) - args = [SCRIPT] + splitted + args = [RUN_SCRIPT] + splitted try: print("RUNNING %r" % args) diff --git a/tests/test-scheduler.t b/tests/test-scheduler.t --- a/tests/test-scheduler.t +++ b/tests/test-scheduler.t @@ -1,6 +1,6 @@ Test the scheduler - $ export SCHEDULER_TEST_SCRIPT=$TESTDIR/scheduler-test-script-success + $ export SCHEDULER_TEST_RUN_SCRIPT=$TESTDIR/scheduler-test-script-success $ cat << EOF >> TASKS > RUN tip