Merge remote-tracking branch 'upstream/master' into letshelp-apache

.travis.yml

@@ -14,6 +14,7 @@ before_install:
 env:
   global:
     - GOPATH=/tmp/go
+    - PATH=$GOPATH/bin:$PATH
   matrix:
     - TOXENV=py26 BOULDER_INTEGRATION=1
     - TOXENV=py27 BOULDER_INTEGRATION=1
@@ -28,7 +29,7 @@ addons:
     - le.wtf
 
 install: "travis_retry pip install tox coveralls"
-before_script: '[ "xxx$BOULDER_INTEGRATION" = "xxx" ] || ./tests/boulder-start.sh amqp'
+before_script: '[ "xxx$BOULDER_INTEGRATION" = "xxx" ] || ./tests/boulder-start.sh'
 script: 'travis_retry tox && ([ "xxx$BOULDER_INTEGRATION" = "xxx" ] || (source .tox/$TOXENV/bin/activate && ./tests/boulder-integration.sh))'
 
 after_success: '[ "$TOXENV" == "cover" ] && coveralls'

letsencrypt/constants.py

@@ -16,7 +16,7 @@ CLI_DEFAULTS = dict(
                      "letsencrypt", "cli.ini"),
     ],
     verbose_count=-(logging.WARNING / 10),
-    server="https://www.letsencrypt-demo.org/acme/new-reg",
+    server="https://acme-staging.api.letsencrypt.org/acme/new-reg",
     rsa_key_size=2048,
     rollback_checkpoints=0,
     config_dir="/etc/letsencrypt",

tests/boulder-start.sh

@@ -10,11 +10,5 @@ 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.py &
-if [ "$1" = "amqp" ];
+# Hopefully start.py bootstraps before integration test is started...
-then
-    ./start.py &
-else
-    ./start.sh &
-fi
-# Hopefully start.py/start.sh bootstraps before integration test is started...

tests/integration/_common.sh

@@ -2,7 +2,9 @@
 
 if [ "xxx$root" = "xxx" ];
 then
-    root="$(mktemp -d)"
+    # The -t is required on OS X. It provides a template file path for
+    # the kernel to use.
+    root="$(mktemp -d -t leitXXXX)"
     echo "Root integration tests directory: $root"
 fi
 store_flags="--config-dir $root/conf --work-dir $root/work"