Merge fixes

airhorns · Nov 12, 2012 · 535c9c3 · 535c9c3
1 parent 0e8c11e
commit 535c9c3
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 2 deletions.
diff --git a/Gemfile b/Gemfile
@@ -2,5 +2,6 @@ source "http://rubygems.org"
 
 gem 'rspec', '2.11.0'
 gem 'rails', '~> 3.0.17'
+gem 'speedytime'
 gem 'mysql2'
 gemspec
diff --git a/lib/multi_db/lag_monitor.rb b/lib/multi_db/lag_monitor.rb
@@ -1,3 +1,5 @@
+require 'speedytime'
+
 module MultiDb
   module LagMonitor
 

diff --git a/lib/multi_db/query_analyzer.rb b/lib/multi_db/query_analyzer.rb
@@ -1,3 +1,5 @@
+require 'speedytime'
+
 module MultiDb
   module QueryAnalyzer
 

diff --git a/lib/multi_db/scheduler.rb b/lib/multi_db/scheduler.rb
@@ -1,4 +1,5 @@
 require 'tlattr_accessors'
+require 'speedytime'
 require 'active_support/core_ext/module/delegation'
 
 module MultiDb

diff --git a/spec/query_analyzer_spec.rb b/spec/query_analyzer_spec.rb
@@ -38,8 +38,7 @@ def self.q(sql, *tables)
     CURRENT_TIME = 1000
 
     before do
-      now = mock(to_i: CURRENT_TIME)
-      Time.stub(now: now)
+      Speedytime.stub(current: CURRENT_TIME)
     end
 
     it "doesn't require sticky on a fresh read" do