summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Grundy <michael.grundy@10gen.com>2016-02-09 15:40:46 -0500
committerMike Grundy <michael.grundy@10gen.com>2016-02-09 15:41:00 -0500
commit2e4ca677b4b9f776a791b0f8e8c767d5e694bab4 (patch)
tree8b67581655ec70a5ebe898163c5f34e1f496f27c
parentdb7a4ebec8e5f8d027d1489ec9023dd223c0b362 (diff)
downloadmongo-2e4ca677b4b9f776a791b0f8e8c767d5e694bab4.tar.gz
SERVER-22341 fix jslint errors in jstests/multiVersion/minor_version* with eslint --fix
-rw-r--r--jstests/multiVersion/minor_version_downgrade_replset.js4
-rw-r--r--jstests/multiVersion/minor_version_tags_new_old_new.js2
-rw-r--r--jstests/multiVersion/minor_version_tags_old_new_old.js2
-rw-r--r--jstests/multiVersion/minor_version_upgrade_replset.js64
4 files changed, 36 insertions, 36 deletions
diff --git a/jstests/multiVersion/minor_version_downgrade_replset.js b/jstests/multiVersion/minor_version_downgrade_replset.js
index db842f35a5d..e91c22250ac 100644
--- a/jstests/multiVersion/minor_version_downgrade_replset.js
+++ b/jstests/multiVersion/minor_version_downgrade_replset.js
@@ -1,8 +1,8 @@
// Test the downgrade of a replica set from latest version
// to last-stable version succeeds, while reads and writes continue.
-load('./jstests/multiVersion/libs/multi_rs.js')
-load('./jstests/libs/test_background_ops.js')
+load('./jstests/multiVersion/libs/multi_rs.js');
+load('./jstests/libs/test_background_ops.js');
// 3.2.1 is the final version to use the old style replSetUpdatePosition command.
var oldVersion = "3.2.1";
diff --git a/jstests/multiVersion/minor_version_tags_new_old_new.js b/jstests/multiVersion/minor_version_tags_new_old_new.js
index 55a8ea840ec..bddc283558a 100644
--- a/jstests/multiVersion/minor_version_tags_new_old_new.js
+++ b/jstests/multiVersion/minor_version_tags_new_old_new.js
@@ -9,7 +9,7 @@
n2 : { binVersion : oldVersion },
n3 : { binVersion : newVersion },
n4 : { binVersion : oldVersion },
- n5 : { binVersion : newVersion } }
+ n5 : { binVersion : newVersion } };
var host = getHostName();
var name = 'tags';
diff --git a/jstests/multiVersion/minor_version_tags_old_new_old.js b/jstests/multiVersion/minor_version_tags_old_new_old.js
index a5d11b5edf1..d1de541acf2 100644
--- a/jstests/multiVersion/minor_version_tags_old_new_old.js
+++ b/jstests/multiVersion/minor_version_tags_old_new_old.js
@@ -9,7 +9,7 @@
n2 : { binVersion : newVersion },
n3 : { binVersion : oldVersion },
n4 : { binVersion : newVersion },
- n5 : { binVersion : oldVersion } }
+ n5 : { binVersion : oldVersion } };
var host = getHostName();
var name = 'tags';
diff --git a/jstests/multiVersion/minor_version_upgrade_replset.js b/jstests/multiVersion/minor_version_upgrade_replset.js
index efabceffbf1..1c153a1e675 100644
--- a/jstests/multiVersion/minor_version_upgrade_replset.js
+++ b/jstests/multiVersion/minor_version_upgrade_replset.js
@@ -2,85 +2,85 @@
// Tests upgrading a replica set
//
-load( './jstests/multiVersion/libs/multi_rs.js' )
-load( './jstests/libs/test_background_ops.js' )
+load( './jstests/multiVersion/libs/multi_rs.js' );
+load( './jstests/libs/test_background_ops.js' );
// 3.2.1 is the final version to use the old style replSetUpdatePosition command.
var oldVersion = "3.2.1";
var nodes = { n1 : { binVersion : oldVersion },
n2 : { binVersion : oldVersion },
- a3 : { binVersion : oldVersion } }
+ a3 : { binVersion : oldVersion } };
-var rst = new ReplSetTest({ nodes : nodes })
+var rst = new ReplSetTest({ nodes : nodes });
-rst.startSet()
-rst.initiate()
+rst.startSet();
+rst.initiate();
// Wait for a primary node...
-var primary = rst.getPrimary()
-var otherOpConn = new Mongo( rst.getURL() )
-var insertNS = "test.foo"
+var primary = rst.getPrimary();
+var otherOpConn = new Mongo( rst.getURL() );
+var insertNS = "test.foo";
-jsTest.log( "Starting parallel operations during upgrade..." )
+jsTest.log( "Starting parallel operations during upgrade..." );
function findAndInsert( rsURL, coll ){
- var coll = new Mongo( rsURL ).getCollection( coll + "" )
- var count = 0
+ var coll = new Mongo( rsURL ).getCollection( coll + "" );
+ var count = 0;
- jsTest.log( "Starting finds and inserts..." )
+ jsTest.log( "Starting finds and inserts..." );
while( ! isFinished() ){
try{
- coll.insert({ _id : count, hello : "world" })
- assert.eq( null, coll.getDB().getLastError() )
- assert.neq( null, coll.findOne({ _id : count }) )
+ coll.insert({ _id : count, hello : "world" });
+ assert.eq( null, coll.getDB().getLastError() );
+ assert.neq( null, coll.findOne({ _id : count }) );
}
catch( e ){
- printjson( e )
+ printjson( e );
}
- count++
+ count++;
}
- jsTest.log( "Finished finds and inserts..." )
- return count
+ jsTest.log( "Finished finds and inserts..." );
+ return count;
}
var joinFindInsert =
startParallelOps( primary, // The connection where the test info is passed and stored
findAndInsert,
- [ rst.getURL(), insertNS ] )
+ [ rst.getURL(), insertNS ] );
-jsTest.log( "Upgrading replica set..." )
+jsTest.log( "Upgrading replica set..." );
rst.upgradeSet({ binVersion: "latest" });
-jsTest.log( "Replica set upgraded." )
+jsTest.log( "Replica set upgraded." );
// Wait for primary
-var primary = rst.getPrimary()
+var primary = rst.getPrimary();
-printjson( rst.status() )
+printjson( rst.status() );
// Allow more valid writes to go through
-sleep( 10 * 1000 )
+sleep( 10 * 1000 );
-joinFindInsert()
+joinFindInsert();
-var totalInserts = primary.getCollection( insertNS ).find().sort({ _id : -1 }).next()._id + 1
-var dataFound = primary.getCollection( insertNS ).count()
+var totalInserts = primary.getCollection( insertNS ).find().sort({ _id : -1 }).next()._id + 1;
+var dataFound = primary.getCollection( insertNS ).count();
-jsTest.log( "Found " + dataFound + " docs out of " + tojson( totalInserts ) + " inserted." )
+jsTest.log( "Found " + dataFound + " docs out of " + tojson( totalInserts ) + " inserted." );
-assert.gt( dataFound / totalInserts, 0.5 )
+assert.gt( dataFound / totalInserts, 0.5 );
-rst.stopSet()
+rst.stopSet();