[PATCH] test_watcher: disable test correctly when aggregate is missing

[PATCH] test_watcher: disable test correctly when aggregate is missing

[Eric Wong]

Oops :x
---
 test/test_aggregate_pmq.rb          | 2 +-
 test/test_last_data_recv_unicorn.rb | 2 +-
 test/test_watcher.rb                | 7 ++++++-
 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 @@
 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 @@
 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 @@ def test_peaks
     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)
-- 
EW