← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] ~cjwatson/turnip:bootstrap-test-path into turnip:master

 

Colin Watson has proposed merging ~cjwatson/turnip:bootstrap-test-path into turnip:master.

Commit message:
Make sure /usr/sbin is on $PATH for bootstrap-test

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/turnip/+git/turnip/+merge/389772

rabbitmqctl is in /usr/sbin, which isn't always on $PATH.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/turnip:bootstrap-test-path into turnip:master.
diff --git a/Makefile b/Makefile
index f907f9c..628d4c8 100644
--- a/Makefile
+++ b/Makefile
@@ -64,6 +64,7 @@ endif
 	$(PIP) install $(PIP_ARGS) -c requirements.txt \
 		-e '.[test,deploy]'
 
+bootstrap-test: PATH := /usr/sbin:/sbin:$(PATH)
 bootstrap-test:
 	-sudo rabbitmqctl delete_vhost turnip-test-vhost
 	-sudo rabbitmqctl add_vhost turnip-test-vhost