diff options
author | Eric Wong <e@80x24.org> | 2023-12-29 17:50:18 +0000 |
---|---|---|
committer | Eric Wong <bofh@yhbt.net> | 2024-01-15 02:57:58 +0000 |
commit | 1ab622e60153840fdaa83cdbc01ba2dce1794c21 (patch) | |
tree | f8f2355f71e50edaf016cf5d9c6b984d8ff8e4f2 | |
parent | 4dcd2caa9d7691d6a4f1d3fc0a0a4b54ac6fad6b (diff) | |
download | raindrops-1ab622e60153840fdaa83cdbc01ba2dce1794c21.tar.gz |
Diskspace and bandwidth are expensive, and we can make rack+aggregate optional in tests, too.
-rw-r--r-- | test/rack_unicorn.rb | 3 | ||||
-rw-r--r-- | test/test_last_data_recv.rb | 8 | ||||
-rw-r--r-- | test/test_watcher.rb | 4 |
3 files changed, 10 insertions, 5 deletions
diff --git a/test/rack_unicorn.rb b/test/rack_unicorn.rb index 779e8bf..0ecbd42 100644 --- a/test/rack_unicorn.rb +++ b/test/rack_unicorn.rb @@ -1,11 +1,10 @@ # -*- encoding: binary -*- require "test/unit" require "raindrops" -require "rack" -require "rack/lobster" require "open-uri" begin require "unicorn" + require "rack" require "rack/lobster" rescue LoadError => e warn "W: #{e} skipping test since Rack or Unicorn was not found" diff --git a/test/test_last_data_recv.rb b/test/test_last_data_recv.rb index ef84e05..b1a5ac6 100644 --- a/test/test_last_data_recv.rb +++ b/test/test_last_data_recv.rb @@ -1,3 +1,9 @@ +begin + require 'aggregate' + have_aggregate = true +rescue LoadError => e + warn "W: #{e} skipping #{__FILE__}" +end require 'test/unit' require 'raindrops' require 'io/wait' @@ -40,4 +46,4 @@ class TestLastDataRecv < Test::Unit::TestCase assert_equal 1, s.raindrops_aggregate.size assert_raise(IO::WaitReadable) { s.accept_nonblock } end -end if RUBY_PLATFORM =~ /linux/ +end if RUBY_PLATFORM =~ /linux/ && have_aggregate diff --git a/test/test_watcher.rb b/test/test_watcher.rb index 28ac49b..e5d1fa2 100644 --- a/test/test_watcher.rb +++ b/test/test_watcher.rb @@ -1,9 +1,9 @@ # -*- encoding: binary -*- require "test/unit" -require "rack" require "raindrops" begin require 'aggregate' + require 'rack' rescue LoadError => e warn "W: #{e} skipping #{__FILE__}" end @@ -183,4 +183,4 @@ class TestWatcher < Test::Unit::TestCase assert_equal queued_before, headers["X-Last-Peak-At"], "should not change" assert_equal start, headers["X-First-Peak-At"] end -end if RUBY_PLATFORM =~ /linux/ && defined?(Aggregate) +end if RUBY_PLATFORM =~ /linux/ && defined?(Aggregate) && defined?(Rack) |