Merge pull request #553 from estolfo/cursor-info

Remove use of cursorInfo in tests for versions > 2.6

Author: estolfo

test/functional/cursor_test.rb

@@ -468,60 +468,52 @@ def test_close_after_query_sent
   def test_kill_cursors
     @coll.drop
 
-    client_cursors = @db.command("cursorInfo" => 1)["clientCursors_size"]
+    client_cursors = cursor_count(@db)
 
     10000.times do |i|
       @coll.insert("i" => i)
     end
 
-    assert_equal(client_cursors,
-                 @db.command("cursorInfo" => 1)["clientCursors_size"])
+    assert_equal(client_cursors, cursor_count(@db))
 
     10.times do |i|
       @coll.find_one()
     end
 
-    assert_equal(client_cursors,
-                 @db.command("cursorInfo" => 1)["clientCursors_size"])
+    assert_equal(client_cursors, cursor_count(@db))
 
     10.times do |i|
       a = @coll.find()
       a.next_document
       a.close()
     end
 
-    assert_equal(client_cursors,
-                 @db.command("cursorInfo" => 1)["clientCursors_size"])
+    assert_equal(client_cursors, cursor_count(@db))
 
     a = @coll.find()
     a.next_document
 
-    assert_not_equal(client_cursors,
-                     @db.command("cursorInfo" => 1)["clientCursors_size"])
+    assert_not_equal(client_cursors, cursor_count(@db))
 
     a.close()
 
-    assert_equal(client_cursors,
-                 @db.command("cursorInfo" => 1)["clientCursors_size"])
+    assert_equal(client_cursors, cursor_count(@db))
 
     a = @coll.find({}, :limit => 10).next_document
 
-    assert_equal(client_cursors,
-                 @db.command("cursorInfo" => 1)["clientCursors_size"])
+    assert_equal(client_cursors, cursor_count(@db))
 
     @coll.find() do |cursor|
       cursor.next_document
     end
 
-    assert_equal(client_cursors,
-                 @db.command("cursorInfo" => 1)["clientCursors_size"])
+    assert_equal(client_cursors, cursor_count(@db))
 
     @coll.find() { |cursor|
       cursor.next_document
     }
 
-    assert_equal(client_cursors,
-                 @db.command("cursorInfo" => 1)["clientCursors_size"])
+    assert_equal(client_cursors, cursor_count(@db))
   end
 
   def test_count_with_fields
@@ -680,4 +672,12 @@ def test_instance_transformation_with_each
       assert_instance_of(klass, instance)
     end
   end
+
+  def cursor_count(db)
+    if @version > '2.6.0'
+      db.command("serverStatus" => 1)["metrics"]["cursor"]["open"]["total"]
+    else
+      db.command("cursorInfo" => 1)["clientCursors_size"]
+    end
+  end
 end