Commit 5a23cfff authored by Hunter Loftis's avatar Hunter Loftis

Merge pull request #265 from heroku/performance-l

Performance L
parents b4921004 3425f11f
...@@ -23,7 +23,7 @@ detect_memory() { ...@@ -23,7 +23,7 @@ detect_memory() {
256) echo "512";; # Standard-1X 256) echo "512";; # Standard-1X
512) echo "1024";; # Standard-2X 512) echo "1024";; # Standard-2X
16384) echo "2560";; # Performance-M 16384) echo "2560";; # Performance-M
32768) echo "6144";; # Performance-L 32768) echo "14336";; # Performance-L
*) echo "$default";; *) echo "$default";;
esac esac
} }
......
...@@ -39,10 +39,10 @@ testConcurrencyPerformanceM() { ...@@ -39,10 +39,10 @@ testConcurrencyPerformanceM() {
assertCapturedSuccess assertCapturedSuccess
} }
testConcurrencyPX() { testConcurrencyPerformanceL() {
LOG_CONCURRENCY=true MEMORY_AVAILABLE=6144 capture $(pwd)/profile/nodejs.sh LOG_CONCURRENCY=true MEMORY_AVAILABLE=14336 capture $(pwd)/profile/nodejs.sh
assertCaptured "Detected 6144 MB available memory, 512 MB limit per process (WEB_MEMORY)" assertCaptured "Detected 14336 MB available memory, 512 MB limit per process (WEB_MEMORY)"
assertCaptured "Recommending WEB_CONCURRENCY=12" assertCaptured "Recommending WEB_CONCURRENCY=28"
assertCapturedSuccess assertCapturedSuccess
} }
...@@ -171,7 +171,7 @@ testNoVersion() { ...@@ -171,7 +171,7 @@ testNoVersion() {
compile "no-version" compile "no-version"
assertCaptured "engines.node (package.json): unspecified" assertCaptured "engines.node (package.json): unspecified"
assertCaptured "Resolving node version (latest stable) via semver.io" assertCaptured "Resolving node version (latest stable) via semver.io"
assertCaptured "Downloading and installing node 0.12." assertCaptured "Downloading and installing node 4."
assertCapturedSuccess assertCapturedSuccess
} }
...@@ -199,7 +199,7 @@ testUnstableVersion() { ...@@ -199,7 +199,7 @@ testUnstableVersion() {
testOldNpm() { testOldNpm() {
compile "old-npm" compile "old-npm"
assertCaptured "This version of npm (1.2.8000) has several known issues - consider upgrading to the latest release (2." assertCaptured "This version of npm (1.2.8000) has several known issues - consider upgrading to the latest release (3."
assertNotCaptured "integer expression expected" assertNotCaptured "integer expression expected"
assertCapturedError assertCapturedError
} }
...@@ -275,7 +275,7 @@ testDangerousRangeStar() { ...@@ -275,7 +275,7 @@ testDangerousRangeStar() {
compile "dangerous-range-star" compile "dangerous-range-star"
assertCaptured "Dangerous semver range" assertCaptured "Dangerous semver range"
assertCaptured "Resolving node version * via semver.io" assertCaptured "Resolving node version * via semver.io"
assertCaptured "Downloading and installing node 0.12." assertCaptured "Downloading and installing node 4."
assertCapturedError assertCapturedError
} }
...@@ -283,14 +283,14 @@ testDangerousRangeGreaterThan() { ...@@ -283,14 +283,14 @@ testDangerousRangeGreaterThan() {
compile "dangerous-range-greater-than" compile "dangerous-range-greater-than"
assertCaptured "Dangerous semver range" assertCaptured "Dangerous semver range"
assertCaptured "Resolving node version >0.4 via semver.io" assertCaptured "Resolving node version >0.4 via semver.io"
assertCaptured "Downloading and installing node 0.12" assertCaptured "Downloading and installing node 4."
assertCapturedError assertCapturedError
} }
testRangeWithSpace() { testRangeWithSpace() {
compile "range-with-space" compile "range-with-space"
assertCaptured "Resolving node version >= 0.8.x via semver.io" assertCaptured "Resolving node version >= 0.8.x via semver.io"
assertCaptured "Downloading and installing node 0.12" assertCaptured "Downloading and installing node 4."
assertCapturedSuccess assertCapturedSuccess
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment