Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
H
heroku-buildpack-nodejs
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
JIRA
JIRA
Merge Requests
0
Merge Requests
0
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Python-Dev
heroku-buildpack-nodejs
Commits
e8ae451d
Commit
e8ae451d
authored
Jan 25, 2015
by
Hunter Loftis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
run tests with docker
parent
197845da
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
52 additions
and
6 deletions
+52
-6
concurrency
concurrency
+38
-0
build.sh
lib/build.sh
+5
-5
docker
test/docker
+9
-0
run
test/run
+0
-1
No files found.
concurrency
0 → 100644
View file @
e8ae451d
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
View file @
e8ae451d
...
...
@@ -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
0 → 100755
View file @
e8ae451d
#!/usr/bin/env bash
set
-e
echo
"Running tests in docker (cedar-14)..."
docker run
-v
$(
pwd
)
:/buildpack:ro
-it
heroku/cedar:14 bash
-c
'cp -r /buildpack /buildpack_test; cd /buildpack_test/; test/run;'
echo
""
echo
"Running tests in docker (cedar)..."
docker run
-v
$(
pwd
)
:/buildpack:ro
-it
fabiokung/cedar bash
-c
'cp -r /buildpack /buildpack_test; cd /buildpack_test/; test/run;'
bin/test
→
test/run
View file @
e8ae451d
...
...
@@ -358,7 +358,6 @@ testMultiExport() {
assertCapturedSuccess
}
# Utils
pushd
$(
dirname
0
)
>
/dev/null
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment