Skip to content

Remove use of cursorInfo in tests for versions > 2.6 #553

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 9, 2014
Merged

Remove use of cursorInfo in tests for versions > 2.6 #553

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions test/functional/cursor_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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