From 620f1e444ea01550ff9466073149f079894775bb Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Sun, 19 Feb 2017 19:34:15 -0800 Subject: [PATCH] travis: Fix various bugs in new queue worker test. * Now queue_workers.py sorts queue names and prints them on their own line. Previously it's output was nondeterministic. * Simplified grep strategy for removing the "test" worker. --- scripts/lib/queue_workers.py | 4 ++-- tools/travis/production-helper | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/lib/queue_workers.py b/scripts/lib/queue_workers.py index 02b6bf8afe..596aae44ab 100755 --- a/scripts/lib/queue_workers.py +++ b/scripts/lib/queue_workers.py @@ -22,5 +22,5 @@ if __name__ == "__main__": help="Specify which types of queues to list") args = parser.parse_args() - workers = get_active_worker_queues(args.queue_type) - print(" ".join(workers)) + for worker in sorted(get_active_worker_queues(args.queue_type)): + print(worker) diff --git a/tools/travis/production-helper b/tools/travis/production-helper index 56dd1694dd..4bbb9bf939 100755 --- a/tools/travis/production-helper +++ b/tools/travis/production-helper @@ -87,8 +87,9 @@ fi echo; echo "Now confirming all the RabbitMQ queue processors are correctly registered!"; echo # These hacky shell scripts just extract the sorted list of queue processors, running and expected supervisorctl status | cut -f1 -dR | cut -f2- -d: | grep events | cut -f1 -d" " | cut -f3- -d_ | cut -f1 -d- | sort -u > /tmp/running_queue_processors.txt -for i in `/home/zulip/deployments/current/scripts/lib/queue_workers.py`; do echo $i | grep -v ^test$; done | sort > /tmp/expected_queue_processors.txt -if diff /tmp/expected_queue_processors.txt /tmp/running_queue_processors.txt >/dev/null; then +/home/zulip/deployments/current/scripts/lib/queue_workers.py | grep -v ^test$ > /tmp/expected_queue_processors.txt +if ! diff /tmp/expected_queue_processors.txt /tmp/running_queue_processors.txt >/dev/null; then + set +x echo "FAILURE: Runnable queue processors declared in zerver/worker/queue_processors.py " echo "do not match those in puppet/manifests/zulip/base.pp" echo "See http://zulip.readthedocs.io/en/latest/queuing.html for details."