Merge branch 'master' of git@github.com:mongodb/mongo

2 files changed, 34 insertions, 1 deletions

diff --git a/jstests/capped3.js b/jstests/capped3.js
index 7dc48559af2..4bb6dcc4ea5 100644
--- a/jstests/capped3.js
+++ b/jstests/capped3.js
@@ -24,4 +24,19 @@ i = 999;
 while( c.hasNext() ) {
     assert.eq( i--, c.next().i );
 }
-assert( i < 990 );
\ No newline at end of file
+assert( i < 990 );
+
+t.drop();
+t2.drop();
+
+for( i = 0; i < 1000; ++i ) {
+    t.save( {i:i} );
+}
+assert.commandWorked( db.runCommand( { convertToCapped:"jstests_capped3", size:1000 } ) );
+c = t.find().sort( {$natural:-1} );
+i = 999;
+while( c.hasNext() ) {
+    assert.eq( i--, c.next().i );
+}
+assert( i < 990 );
+assert( i > 900 );
\ No newline at end of file
diff --git a/jstests/rename.js b/jstests/rename.js
index a6421b7128e..0b8bf954328 100644
--- a/jstests/rename.js
+++ b/jstests/rename.js
@@ -22,3 +22,21 @@ assert.eq( 0, a.find().count() );
 assert.eq( 2, b.find().count() );
 assert.eq( 3, db.system.indexes.find( {ns:"test.jstests_rename_b"} ).count() );
 assert( b.find( {a:1} ).explain().cursor.match( /^BtreeCursor/ ) );
+
+// now try renaming a capped collection
+
+a.drop();
+b.drop();
+c.drop();
+
+db.createCollection( "jstests_rename_a", {capped:true,size:100} );
+for( i = 0; i < 10; ++i ) {
+    a.save( { i: i } );
+}
+assert.commandWorked( admin.runCommand( {renameCollection:"test.jstests_rename_a", to:"test.jstests_rename_b"} ) );
+assert.eq( 1, b.count( {i:9} ) );
+for( i = 10; i < 20; ++i ) {
+    b.save( { i: i } );
+}
+assert.eq( 0, b.count( {i:9} ) );
+assert.eq( 1, b.count( {i:19} ) );