Merge pull request #194 from heroku/docker-tests

Docker tests

README.md

@@ -169,22 +169,21 @@ heroku config:set BUILDPACK_URL=<your-github-url>#your-branch
 
 ## Testing
 
-[Anvil](https://github.com/ddollar/anvil) is a generic build server for Heroku.
+The buildpack tests use [Docker](https://www.docker.com/) to simulate
+Heroku's Cedar and Cedar-14 containers.
 
-```
-gem install anvil-cli
-```
-
-The [heroku-anvil CLI plugin](https://github.com/ddollar/heroku-anvil) is a wrapper for anvil.
+To run the test suite:
 
 ```
-heroku plugins:install https://github.com/ddollar/heroku-anvil
+test/docker
 ```
 
-The [ddollar/test](https://github.com/ddollar/buildpack-test) buildpack runs `bin/test` on your app/buildpack.
+Or to just test in cedar or cedar-14:
 
 ```
-heroku build -b ddollar/test # -b can also point to a local directory
+test/docker cedar
+test/docker cedar-14
 ```
 
-For more info on testing, see [Best Practices for Testing Buildpacks](https://discussion.heroku.com/t/best-practices-for-testing-buildpacks/294) on the Heroku discussion forum.
+The tests are run via the vendored [shunit2](http://shunit2.googlecode.com/svn/trunk/source/2.1/doc/shunit2.html)
+test framework.

concurrency

+testConcurrency1X() {
+  MEMORY_AVAILABLE=512 capture ${bp_dir}/lib/concurrency.sh
+  assertCaptured "Detected 512 MB available memory, 512 MB limit per process (WEB_MEMORY)"
+  assertCaptured "Recommending WEB_CONCURRENCY=1"
+  assertCapturedSuccess
+}
+
+testConcurrency2X() {
+  MEMORY_AVAILABLE=1024 capture ${bp_dir}/lib/concurrency.sh
+  assertCaptured "Detected 1024 MB available memory, 512 MB limit per process (WEB_MEMORY)"
+  assertCaptured "Recommending WEB_CONCURRENCY=2"
+  assertCapturedSuccess
+}
+
+testConcurrencyPX() {
+  MEMORY_AVAILABLE=6144 capture ${bp_dir}/lib/concurrency.sh
+  assertCaptured "Detected 6144 MB available memory, 512 MB limit per process (WEB_MEMORY)"
+  assertCaptured "Recommending WEB_CONCURRENCY=12"
+  assertCapturedSuccess
+}
+
+testConcurrencyCustomLimit() {
+  MEMORY_AVAILABLE=1024 WEB_MEMORY=256 capture ${bp_dir}/lib/concurrency.sh
+  echo "This is STD_OUT:"
+  cat ${STD_OUT}
+  echo "This is STD_ERR:"
+  cat ${STD_ERR}
+  assertCaptured "Detected 1024 MB available memory, 256 MB limit per process (WEB_MEMORY)"
+  assertCaptured "Recommending WEB_CONCURRENCY=6"
+  assertCapturedSuccess
+}
+
+testConcurrencySaneMaximum() {
+  MEMORY_AVAILABLE=6144 WEB_MEMORY=32 capture ${bp_dir}/lib/concurrency.sh
+  assertCaptured "Detected 6144 MB available memory, 32 MB limit per process (WEB_MEMORY)"
+  assertCaptured "Recommending WEB_CONCURRENCY=32"
+  assertCapturedSuccess
+}

lib/build.sh

@@ -155,7 +155,7 @@ install_npm() {
       info "npm `npm --version` already installed with node"
     else
       info "Downloading and installing npm $npm_engine (replacing version `npm --version`)..."
-      npm install --quiet -g npm@$npm_engine 2>&1 >/dev/null | indent
+      npm install --unsafe-perm --quiet -g npm@$npm_engine 2>&1 >/dev/null | indent
     fi
     warn_old_npm `npm --version`
   else
@@ -171,7 +171,7 @@ function build_dependencies() {
     info "Rebuilding any native modules for this architecture"
     npm rebuild 2>&1 | indent
     info "Installing any new modules"
-    npm install --quiet --userconfig $build_dir/.npmrc 2>&1 | indent
+    npm install --unsafe-perm --quiet --userconfig $build_dir/.npmrc 2>&1 | indent
 
   else
     cache_status=$(get_cache_status)
@@ -180,14 +180,14 @@ function build_dependencies() {
       info "Restoring node modules from cache"
       cp -r $cache_dir/node/node_modules $build_dir/
       info "Pruning unused dependencies"
-      npm prune 2>&1 | indent
+      npm --unsafe-perm prune 2>&1 | indent
       info "Installing any new modules"
-      npm install --quiet --userconfig $build_dir/.npmrc 2>&1 | indent
+      npm install --unsafe-perm --quiet --userconfig $build_dir/.npmrc 2>&1 | indent
     else
       info "$cache_status"
       info "Installing node modules"
       touch $build_dir/.npmrc
-      npm install --quiet --userconfig $build_dir/.npmrc 2>&1 | indent
+      npm install --unsafe-perm --quiet --userconfig $build_dir/.npmrc 2>&1 | indent
     fi
   fi
 }

test/docker

+#!/usr/bin/env bash
+
+cedar-14() {
+  echo "Running tests in docker (cedar-14)..."
+  docker run -v $(pwd):/buildpack:ro --rm -it heroku/cedar:14 bash -c 'cp -r /buildpack /buildpack_test; cd /buildpack_test/; test/run;'
+  echo ""
+}
+
+cedar() {
+  echo "Running tests in docker (cedar)..."
+  docker run -v $(pwd):/buildpack:ro --rm -it fabiokung/cedar bash -c 'cp -r /buildpack /buildpack_test; cd /buildpack_test/; test/run;'
+}
+
+if [ "$1" == "cedar-14" ]; then
+  cedar-14
+elif [ "$1" == "cedar" ]; then
+  cedar
+else
+  cedar-14
+  cedar
+fi