From 2f357073b711788432b3de8fcca28c6ae6cb45d3 Mon Sep 17 00:00:00 2001
From: Tyson Tate <tyson@tysontate.com>
Date: Tue, 30 Oct 2012 23:21:40 -0700
Subject: [PATCH 1/2] Make queues_with_sizes test more reliable.

Because Sidekiq only sorts on the count and not the queue name, the test can
sometimes fail due to "bar" and "baz" being transposed. This commit ensures a
predictable ordering in tests.
---
 test/test_stats.rb | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/test/test_stats.rb b/test/test_stats.rb
index 8e55601a..05b88db2 100644
--- a/test/test_stats.rb
+++ b/test/test_stats.rb
@@ -71,24 +71,23 @@ class TestStats < MiniTest::Unit::TestCase
           conn.rpush 'queue:foo', '{}'
           conn.sadd 'queues', 'foo'
 
-          conn.rpush 'queue:bar', '{}'
-          conn.rpush 'queue:bar', '{}'
+          3.times { conn.rpush 'queue:bar', '{}' }
           conn.sadd 'queues', 'bar'
 
-          conn.rpush 'queue:baz', '{}'
+          2.times { conn.rpush 'queue:baz', '{}' }
           conn.sadd 'queues', 'baz'
         end
       end
 
       describe "queues_with_sizes" do
         it "returns queue names and corresponding job counts" do
-          assert_equal [["foo", 1], ["baz", 1], ["bar", 2]], Sidekiq.info[:queues_with_sizes]
+          assert_equal [["foo", 1], ["baz", 2], ["bar", 3]], Sidekiq.info[:queues_with_sizes]
         end
       end
 
       describe "backlog" do
         it "returns count of all jobs yet to be processed" do
-          assert_equal 4, Sidekiq.info[:backlog]
+          assert_equal 6, Sidekiq.info[:backlog]
         end
       end
 
@@ -97,8 +96,8 @@ class TestStats < MiniTest::Unit::TestCase
           assert_equal 0, Sidekiq.size("foox")
           assert_equal 1, Sidekiq.size(:foo)
           assert_equal 1, Sidekiq.size("foo")
-          assert_equal 3, Sidekiq.size("foo", "bar")
-          assert_equal 4, Sidekiq.size
+          assert_equal 4, Sidekiq.size("foo", "bar")
+          assert_equal 6, Sidekiq.size
         end
       end
     end

From 08f54d1e1194a03c3b21bc4ebca3145bcc0fbb92 Mon Sep 17 00:00:00 2001
From: Tyson Tate <tyson@tysontate.com>
Date: Tue, 30 Oct 2012 23:26:32 -0700
Subject: [PATCH 2/2] Remove unused variables in tests.

---
 test/test_middleware.rb | 1 -
 test/test_stats.rb      | 1 -
 2 files changed, 2 deletions(-)

diff --git a/test/test_middleware.rb b/test/test_middleware.rb
index 2546d487..75f255d7 100644
--- a/test/test_middleware.rb
+++ b/test/test_middleware.rb
@@ -43,7 +43,6 @@ class TestMiddleware < MiniTest::Unit::TestCase
     end
 
     it 'executes middleware in the proper order' do
-      recorder = []
       msg = Sidekiq.dump_json({ 'class' => CustomWorker.to_s, 'args' => [$recorder] })
 
       Sidekiq.server_middleware do |chain|
diff --git a/test/test_stats.rb b/test/test_stats.rb
index 05b88db2..1264b8b7 100644
--- a/test/test_stats.rb
+++ b/test/test_stats.rb
@@ -55,7 +55,6 @@ class TestStats < MiniTest::Unit::TestCase
 
         processor = Sidekiq::Processor.new(boss)
 
-        pstr = processor.to_s
         assert_raises RuntimeError do
           processor.process(msg, 'xyzzy')
         end