summaryrefslogtreecommitdiff
path: root/yarns.webapp
diff options
context:
space:
mode:
authorBen Brown <ben.brown@codethink.co.uk>2015-12-15 11:28:47 +0000
committerBen Brown <ben.brown@codethink.co.uk>2015-12-15 11:53:47 +0000
commitce7951ae8f2725c427388eece9c1ad1ef28ba810 (patch)
treebb7d0cb749446e7a9d7be02bacc4088e02be9ac3 /yarns.webapp
parentff83a8987cae6aba71e4b912d6f3dd7a390fc1c3 (diff)
downloadlorry-controller-ce7951ae8f2725c427388eece9c1ad1ef28ba810.tar.gz
Remove trailing whitespace
While we're here, seeing as Adam mentioned it. Change-Id: I5ddb86c70d76a84cf12fbd4eb91f3802e490d745
Diffstat (limited to 'yarns.webapp')
-rw-r--r--yarns.webapp/030-queue-management.yarn4
-rw-r--r--yarns.webapp/040-running-jobs.yarn8
-rw-r--r--yarns.webapp/900-implementations.yarn16
3 files changed, 14 insertions, 14 deletions
diff --git a/yarns.webapp/030-queue-management.yarn b/yarns.webapp/030-queue-management.yarn
index ebf50af..a90966a 100644
--- a/yarns.webapp/030-queue-management.yarn
+++ b/yarns.webapp/030-queue-management.yarn
@@ -60,7 +60,7 @@ when WEBAPP has never read its configuration.
WHEN admin makes request GET /1.0/list-queue
THEN response has queue set to []
-
+
Make WEBAPP read an empty configuration. Or rather, a configuration
that does not match any existing `.lorry` files.
@@ -92,7 +92,7 @@ Add two Lorries, then make sure they can reordered at will.
WHEN admin makes request POST /1.0/read-configuration
AND admin makes request GET /1.0/list-queue
THEN response has queue set to ["upstream/bar", "upstream/foo"]
-
+
WHEN admin makes request POST /1.0/move-to-top with path=upstream/foo
AND admin makes request GET /1.0/list-queue
THEN response has queue set to ["upstream/foo", "upstream/bar"]
diff --git a/yarns.webapp/040-running-jobs.yarn b/yarns.webapp/040-running-jobs.yarn
index 1c9a4de..5e47d1c 100644
--- a/yarns.webapp/040-running-jobs.yarn
+++ b/yarns.webapp/040-running-jobs.yarn
@@ -24,7 +24,7 @@ Then make sure we don't get a job when we request one.
WHEN admin makes request POST /1.0/give-me-job with host=testhost&pid=123
THEN response has job_id set to null
-
+
WHEN admin makes request GET /1.0/list-running-jobs
THEN response has running_jobs set to []
@@ -52,7 +52,7 @@ Enable the queue, and off we go.
WHEN admin makes request GET /1.0/lorry/upstream/foo
THEN response has running_job set to 1
AND response has jobs set to [1]
-
+
WHEN admin makes request GET /1.0/list-running-jobs
THEN response has running_jobs set to [1]
@@ -311,7 +311,7 @@ which marks all jobs finished that haven't had a `job-update` called
on them for a long time.
SCENARIO forget jobs without MINION updates in a long time
-
+
Set up a WEBAPP that uses a CONFGIT with a Lorry file, so we can start
a job.
@@ -374,7 +374,7 @@ WEBAPP doesn't remove jobs automatically, it needs to be told to
remove jobs.
SCENARIO remove job
-
+
Setup.
GIVEN a new git repository in CONFGIT
diff --git a/yarns.webapp/900-implementations.yarn b/yarns.webapp/900-implementations.yarn
index 24dcf51..06411a7 100644
--- a/yarns.webapp/900-implementations.yarn
+++ b/yarns.webapp/900-implementations.yarn
@@ -28,7 +28,7 @@ be running until it crashes or is explicitly killed.
IMPLEMENTS WHEN WEBAPP is started
start_webapp
-
+
Kill the running WEBAPP, using the recorded PID. We need to do this
both as a WHEN and a FINALLY step.
@@ -89,9 +89,9 @@ most of the configuration.
python -c '
import os
import yarnlib
-
+
MATCH_1, MATCH_2, MATCH_3, MATCH_4 = yarnlib.matches()
-
+
new = {
"type": "lorries",
"interval": "0s",
@@ -117,7 +117,7 @@ most of the configuration.
import yarnlib
MATCH_1, MATCH_2, MATCH_3 = yarnlib.matches()
-
+
new = {
"type": "troves",
"trovehost": MATCH_3,
@@ -142,7 +142,7 @@ file.
import os
import json
import yarnlib
-
+
MATCH_1, MATCH_2, MATCH_3, MATCH_4 = yarnlib.matches()
filename = os.path.join(yarnlib.DATADIR, MATCH_2, MATCH_1)
@@ -207,9 +207,9 @@ file. Note that the Trove must already be in the configuration file.
python -c '
import os
import yarnlib
-
+
MATCH_1, MATCH_2, MATCH_3, MATCH_4, MATCH_5 = yarnlib.matches()
-
+
filename = os.path.join(yarnlib.DATADIR, MATCH_2, MATCH_1)
objs = yarnlib.load_json_from_file(filename)
@@ -432,7 +432,7 @@ purpose.
# that's OK on filesystems that only store full-second timestamps.
# We generate timestamps in (roughly) ISO 8601 format, with stat,
# and those can be compared using simple string comparison.
-
+
status=$(stat -c %y "$DATADIR/lc-status.html")
request=$(stat -c %y "$DATADIR/request.timestamp")
test "$request" = "$status" || test "$request" '<' "$status"