summary refs log tree commit homepage
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2010-06-09 23:50:00 +0000
committerEric Wong <normalperson@yhbt.net>2010-06-10 02:54:25 +0000
commit107f33b2205829c0ef07216255b4ec0e9b8f6730 (patch)
tree65725f218810afb33627e13abff9e23494e647f3
parent56519d744eea72ace7c325d37b493ab9217ef44f (diff)
It's a good idea to use a caching http_proxy to save bandwidth
when isolating gems for different Ruby versions.
-rw-r--r--t/test-lib.sh6
-rw-r--r--test/test_helper.rb3
2 files changed, 9 insertions, 0 deletions
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 22497f3..314e0c3 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -4,6 +4,12 @@
 . ./my-tap-lib.sh
 
 set +u
+
+# sometimes we rely on http_proxy to avoid wasting bandwidth with Isolate
+# and multiple Ruby versions
+NO_PROXY=${UNICORN_TEST_ADDR-127.0.0.1}
+export NO_PROXY
+
 set -e
 RUBY="${RUBY-ruby}"
 RUBY_VERSION=${RUBY_VERSION-$($RUBY -e 'puts RUBY_VERSION')}
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 5b750ee..f0da9c1 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -8,6 +8,9 @@
 
 STDIN.sync = STDOUT.sync = STDERR.sync = true # buffering makes debugging hard
 
+# FIXME: move curl-dependent tests into t/
+ENV['NO_PROXY'] ||= ENV['UNICORN_TEST_ADDR'] || '127.0.0.1'
+
 # Some tests watch a log file or a pid file to spring up to check state
 # Can't rely on inotify on non-Linux and logging to a pipe makes things
 # more complicated