Hardcode expected date format so we don't depend on global state, fixes

sidekiq#2432
sandersch · Jul 14, 2015 · 5133344 · 5133344
1 parent 4433e68
commit 5133344
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/lib/sidekiq/api.rb b/lib/sidekiq/api.rb
@@ -159,14 +159,15 @@ def date_stat_hash(stat)
 
         while i < @days_previous
           date = @start_date - i
-          keys << "stat:#{stat}:#{date}"
-          dates << date
+          datestr = date.strftime("%Y-%m-%d".freeze)
+          keys << "stat:#{stat}:#{datestr}"
+          dates << datestr
           i += 1
         end
 
         Sidekiq.redis do |conn|
           conn.mget(keys).each_with_index do |value, idx|
-            stat_hash[dates[idx].to_s] = value ? value.to_i : 0
+            stat_hash[dates[idx]] = value ? value.to_i : 0
           end
         end
 

diff --git a/test/test_api.rb b/test/test_api.rb
@@ -4,10 +4,16 @@ class TestApi < Sidekiq::Test
 
   describe "stats" do
     before do
+      @before = DateTime::DATE_FORMATS[:default]
+      DateTime::DATE_FORMATS[:default] = "%d/%m/%Y %H:%M:%S"
       Sidekiq.redis = REDIS
       Sidekiq.redis {|c| c.flushdb }
     end
 
+    after do
+      DateTime::DATE_FORMATS[:default] = @before
+    end
+
     describe "processed" do
       it "is initially zero" do
         s = Sidekiq::Stats.new