summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron <aaron@10gen.com>2010-01-06 00:10:19 -0800
committerAaron <aaron@10gen.com>2010-01-06 00:10:19 -0800
commitf124e60fd1f9b4f90cdbd752d138b968f59b4096 (patch)
treeaab1bce186bd3f96d0cd42d4c03841816d249c37
parent4e93eb843dd31f4816cf62b4af3568b3b29a046e (diff)
downloadmongo-f124e60fd1f9b4f90cdbd752d138b968f59b4096.tar.gz
Revert "SERVER-470 don's use namespace 'bar' in jstests"
This reverts commit 796528283a1ba9d078dc9d22fa971e8f682bbc69.
-rw-r--r--jstests/index_many.js6
-rw-r--r--jstests/sort1.js22
-rw-r--r--jstests/uniqueness.js10
3 files changed, 19 insertions, 19 deletions
diff --git a/jstests/index_many.js b/jstests/index_many.js
index 9960afa4fba..bc76cb7e206 100644
--- a/jstests/index_many.js
+++ b/jstests/index_many.js
@@ -1,7 +1,7 @@
t = db.many;
t.drop();
-db.many2.drop();
+db.bar.drop();
t.save({x:9});
t.save({x:19});
@@ -27,8 +27,8 @@ assert( t.getIndexes().length == 40, "40" );
assert( t.find({x:9}).length() == 1, "b" ) ;
-t.renameCollection( "many2" );
+t.renameCollection( "bar" );
assert( t.find({x:9}).length() == 0, "c" ) ;
-assert( db.many2.find({x:9}).length() == 1, "d" ) ;
+assert( db.bar.find({x:9}).length() == 1, "d" ) ;
diff --git a/jstests/sort1.js b/jstests/sort1.js
index 341b3437feb..20dd1892f8c 100644
--- a/jstests/sort1.js
+++ b/jstests/sort1.js
@@ -29,22 +29,22 @@ debug( "b" )
assert(t.validate().valid);
-db.sorrrt2.drop();
-db.sorrrt2.save({x:'a'});
-db.sorrrt2.save({x:'aba'});
-db.sorrrt2.save({x:'zed'});
-db.sorrrt2.save({x:'foo'});
+db.bar.drop();
+db.bar.save({x:'a'});
+db.bar.save({x:'aba'});
+db.bar.save({x:'zed'});
+db.bar.save({x:'foo'});
debug( "c" )
for( var pass = 0; pass < 2; pass++ ) {
- debug( tojson( db.sorrrt2.find().sort( { "x" : 1 } ).limit(1).next() ) );
- assert.eq( "a" , db.sorrrt2.find().sort({'x': 1}).limit(1).next().x , "c.1" );
- assert.eq( "a" , db.sorrrt2.find().sort({'x': 1}).next().x , "c.2" );
- assert.eq( "zed" , db.sorrrt2.find().sort({'x': -1}).limit(1).next().x , "c.3" );
- assert.eq( "zed" , db.sorrrt2.find().sort({'x': -1}).next().x , "c.4" );
+ debug( tojson( db.bar.find().sort( { "x" : 1 } ).limit(1).next() ) );
+ assert.eq( "a" , db.bar.find().sort({'x': 1}).limit(1).next().x , "c.1" );
+ assert.eq( "a" , db.bar.find().sort({'x': 1}).next().x , "c.2" );
+ assert.eq( "zed" , db.bar.find().sort({'x': -1}).limit(1).next().x , "c.3" );
+ assert.eq( "zed" , db.bar.find().sort({'x': -1}).next().x , "c.4" );
}
debug( "d" )
-assert(db.sorrrt2.validate().valid);
+assert(db.bar.validate().valid);
diff --git a/jstests/uniqueness.js b/jstests/uniqueness.js
index f1651b31c65..73c1cda8f23 100644
--- a/jstests/uniqueness.js
+++ b/jstests/uniqueness.js
@@ -22,11 +22,11 @@ assert( db.getLastError() , 4);
assert( t.findOne( {_id:4} ), 5 );
// Check for an error message when we index and there are dups
-db.jstests_uniqueness2.drop();
-db.jstests_uniqueness2.insert({a:3});
-db.jstests_uniqueness2.insert({a:3});
-assert( db.jstests_uniqueness2.count() == 2 , 6) ;
-db.jstests_uniqueness2.ensureIndex({a:1}, true);
+db.bar.drop();
+db.bar.insert({a:3});
+db.bar.insert({a:3});
+assert( db.bar.count() == 2 , 6) ;
+db.bar.ensureIndex({a:1}, true);
assert( db.getLastError() , 7);
/* Check that if we update and remove _id, it gets added back by the DB */