about summary refs log tree commit homepage
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2017-03-15 23:39:46 +0000
committerEric Wong <e@80x24.org>2017-03-15 23:41:44 +0000
commit8d9f163a159a1366a86ba166142b4f6f3fd38083 (patch)
tree2d9b967f25dbf6e5acd7999f44c3cedb3cb437fd
parent93e936d9a1586d25c338c6974027d6aa70960e1b (diff)
downloadraindrops-8d9f163a159a1366a86ba166142b4f6f3fd38083.tar.gz
While we're at it, improve the description of other skips.
-rw-r--r--test/test_aggregate_pmq.rb2
-rw-r--r--test/test_last_data_recv_unicorn.rb2
-rw-r--r--test/test_watcher.rb7
3 files changed, 8 insertions, 3 deletions
diff --git a/test/test_aggregate_pmq.rb b/test/test_aggregate_pmq.rb
index 7748b4f..692b9bd 100644
--- a/test/test_aggregate_pmq.rb
+++ b/test/test_aggregate_pmq.rb
@@ -3,7 +3,7 @@ require "raindrops"
 pmq = begin
   Raindrops::Aggregate::PMQ
 rescue LoadError => e
-  warn "W: #{e} skipping test"
+  warn "W: #{e} skipping #{__FILE__}"
   false
 end
 if RUBY_VERSION.to_f < 1.9
diff --git a/test/test_last_data_recv_unicorn.rb b/test/test_last_data_recv_unicorn.rb
index ca48715..60d1be9 100644
--- a/test/test_last_data_recv_unicorn.rb
+++ b/test/test_last_data_recv_unicorn.rb
@@ -7,7 +7,7 @@ $stderr.sync = $stdout.sync = true
 pmq = begin
   Raindrops::Aggregate::PMQ
 rescue LoadError => e
-  warn "W: #{e} skipping test"
+  warn "W: #{e} skipping #{__FILE__}"
   false
 end
 if RUBY_VERSION.to_f < 1.9
diff --git a/test/test_watcher.rb b/test/test_watcher.rb
index 70e8e75..d1e4d15 100644
--- a/test/test_watcher.rb
+++ b/test/test_watcher.rb
@@ -2,6 +2,11 @@
 require "test/unit"
 require "rack"
 require "raindrops"
+begin
+  require 'aggregate'
+rescue LoadError => e
+  warn "W: #{e} skipping #{__FILE__}"
+end
 
 class TestWatcher < Test::Unit::TestCase
   TEST_ADDR = ENV['UNICORN_TEST_ADDR'] || '127.0.0.1'
@@ -178,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/
+end if RUBY_PLATFORM =~ /linux/ && defined?(Aggregate)