Merge remote-tracking branch 'upstream/master' into plugin_tests

.travis.yml

@@ -1,5 +1,8 @@
 language: python
 
+services:
+  - rabbitmq
+
 # http://docs.travis-ci.com/user/ci-environment/#CI-environment-OS
 before_install:
   - travis_retry sudo ./bootstrap/ubuntu.sh
@@ -20,7 +23,7 @@ env:
     - TOXENV=cover
 
 install: "travis_retry pip install tox coveralls"
-before_script: '[ "xxx$BOULDER_INTEGRATION" = "xxx" ] || ./tests/boulder-start.sh'
+before_script: '[ "xxx$BOULDER_INTEGRATION" = "xxx" ] || ./tests/boulder-start.sh amqp'
 script: 'travis_retry tox && ([ "xxx$BOULDER_INTEGRATION" = "xxx" ] || (source .tox/$TOXENV/bin/activate && ./tests/boulder-integration.sh))'
 
 after_success: '[ "$TOXENV" == "cover" ] && coveralls'

letsencrypt/cli.py

@@ -57,7 +57,7 @@ USAGE = SHORT_USAGE + """Major SUBCOMMANDS are:
   install              Install a previously obtained cert in a server
   revoke               Revoke a previously obtained certificate
   rollback             Rollback server configuration changes made during install
-  config-changes       Show changes made to server config during installation
+  config_changes       Show changes made to server config during installation
 
 Choice of server for authentication/installation:
 

tests/boulder-start.sh

@@ -11,5 +11,10 @@ export GOPATH="${GOPATH:-/tmp/go}"
 go get -d github.com/letsencrypt/boulder/cmd/boulder
 cd $GOPATH/src/github.com/letsencrypt/boulder
 make -j4  # Travis has 2 cores per build instance.
-./start.sh &
-# Hopefully start.sh bootstraps before integration test is started...
+if [ "$1" = "amqp" ];
+then
+    ./start.py &
+else
+    ./start.sh &
+fi
+# Hopefully start.py/start.sh bootstraps before integration test is started...