summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--jstests/basicc.js6
-rw-r--r--jstests/indexb.js4
-rw-r--r--jstests/mr1.js2
-rw-r--r--jstests/padding.js1
-rw-r--r--jstests/sortb.js1
-rw-r--r--jstests/sortf.js1
-rw-r--r--jstests/sortg.js1
-rw-r--r--jstests/sorth.js1
8 files changed, 12 insertions, 5 deletions
diff --git a/jstests/basicc.js b/jstests/basicc.js
index d08f5809da5..0cd71ad32a0 100644
--- a/jstests/basicc.js
+++ b/jstests/basicc.js
@@ -1,7 +1,7 @@
// test writing to two db's at the same time.
t1 = db.jstests_basicc;
-var db = db.getSisterDB("test1");
+var db = db.getSisterDB("test_basicc");
t2 = db.jstests_basicc;
t1.drop();
t2.drop();
@@ -14,6 +14,8 @@ for( var i = 0; i < 1000; ++i ) {
}
assert.automsg( "!db.getLastError()" );
stopMongoProgramByPid( pid );
+// put things back the way we found it
t1.drop();
t2.drop();
-db = db.getSisterDB("test"); // put things back the way we found it \ No newline at end of file
+db.dropDatabase();
+db = db.getSisterDB("test"); \ No newline at end of file
diff --git a/jstests/indexb.js b/jstests/indexb.js
index 5507fee8460..1de49d6f049 100644
--- a/jstests/indexb.js
+++ b/jstests/indexb.js
@@ -5,9 +5,9 @@
// when it doesn't move
-t = db.indexb;t = db.indexb;
+t = db.indexb;
db.dropDatabase();
-t.drop();
+
t.ensureIndex({a:1},true);
t.insert({a:1});
diff --git a/jstests/mr1.js b/jstests/mr1.js
index 93c95e91fb5..33390a6187a 100644
--- a/jstests/mr1.js
+++ b/jstests/mr1.js
@@ -180,5 +180,5 @@ res = db.runCommand( { mapreduce : "mr1" , map : m , reduce : r , out : "mr1_out
assert( res.ok , "should be ok" );
t.drop();
-t1 = db.mr1.out;
+t1 = db.mr1_out;
t1.drop(); \ No newline at end of file
diff --git a/jstests/padding.js b/jstests/padding.js
index 30c8ebecd7b..f6392c413ec 100644
--- a/jstests/padding.js
+++ b/jstests/padding.js
@@ -58,3 +58,4 @@ for (var i = 0; i < 1000; i++) {
// should have trended somewhat higher over the above.
// speed of increase would be higher with more indexes.
assert(p.stats().paddingFactor > ps + 0.03 , "now: " + p.stats().paddingFactor + " ps: " + ps );
+p.drop(); \ No newline at end of file
diff --git a/jstests/sortb.js b/jstests/sortb.js
index 8f76a05bd47..e16c7d650e6 100644
--- a/jstests/sortb.js
+++ b/jstests/sortb.js
@@ -24,3 +24,4 @@ for( i = 200; i < 300; ++i ) {
assert.throws( function() { t.find().sort( {a:-1} ).hint( {b:1} ).limit( 100 ).itcount(); } );
assert.throws( function() { t.find().sort( {a:-1} ).hint( {b:1} ).showDiskLoc().limit( 100 ).itcount(); } );
+t.drop(); \ No newline at end of file
diff --git a/jstests/sortf.js b/jstests/sortf.js
index 5bd8f15be72..615791e25a5 100644
--- a/jstests/sortf.js
+++ b/jstests/sortf.js
@@ -17,3 +17,4 @@ for( i = 0; i < 5; ++i ) {
}
assert.eq( 5, t.find( {a:1} ).sort( {b:1} ).itcount() );
+t.drop(); \ No newline at end of file
diff --git a/jstests/sortg.js b/jstests/sortg.js
index 879a41bad72..09e93949b4b 100644
--- a/jstests/sortg.js
+++ b/jstests/sortg.js
@@ -64,3 +64,4 @@ noMemoryException( {_id:1}, {b:null} );
// retried when the unindexed plan exhausts its memory limit.
assert.eq( 'BtreeCursor b_1', t.find( {b:0} ).sort( {_id:1} ).explain().cursor ); // Record b:1 plan
noMemoryException( {_id:1}, {b:null} );
+t.drop(); \ No newline at end of file
diff --git a/jstests/sorth.js b/jstests/sorth.js
index 061145660e8..6a5f6122b2b 100644
--- a/jstests/sorth.js
+++ b/jstests/sorth.js
@@ -18,3 +18,4 @@ function checkIndex( index, n ) {
checkIndex( "BtreeCursor a_1", 100 );
checkIndex( "BtreeCursor b_1", 500 );
+t.drop(); \ No newline at end of file