Skip to content

Commit

Permalink
travis: Fix various bugs in new queue worker test.
Browse files Browse the repository at this point in the history
* 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.
  • Loading branch information
timabbott committed Feb 20, 2017
1 parent eaaec4c commit 620f1e4
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
4 changes: 2 additions & 2 deletions scripts/lib/queue_workers.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@
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)
5 changes: 3 additions & 2 deletions tools/travis/production-helper
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down

0 comments on commit 620f1e4

Please sign in to comment.