diff options
author | Antonin Kral <a.kral@bobek.cz> | 2011-03-17 00:07:52 +0100 |
---|---|---|
committer | Antonin Kral <a.kral@bobek.cz> | 2011-03-17 00:07:52 +0100 |
commit | 98b8b639326ab4c89eed73739d9903993c4c8959 (patch) | |
tree | 0462df078bf740093774d033b75f0ea24a31fa97 /dbtests/pairingtests.cpp | |
parent | f5d6e97ca8d2f3e7c4cdd5c9afbf8e756ef65bc2 (diff) | |
parent | 582fc32574a3b158c81e49cb00e6ae59205e66ba (diff) | |
download | mongodb-98b8b639326ab4c89eed73739d9903993c4c8959.tar.gz |
Merge commit 'upstream/1.8.0
Diffstat (limited to 'dbtests/pairingtests.cpp')
-rw-r--r-- | dbtests/pairingtests.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/dbtests/pairingtests.cpp b/dbtests/pairingtests.cpp index 68d4c0e..9cca548 100644 --- a/dbtests/pairingtests.cpp +++ b/dbtests/pairingtests.cpp @@ -37,7 +37,7 @@ namespace PairingTests { ~Base() { pairSync = backup; dblock lk; - Helpers::emptyCollection( "local.pair.sync" ); + Helpers::emptyCollection( "local.pair.sync" ); if ( pairSync->initialSyncCompleted() ) { // save to db pairSync->setInitialSyncCompleted(); @@ -63,7 +63,7 @@ namespace PairingTests { private: static void init() { dblock lk; - Helpers::emptyCollection( "local.pair.sync" ); + Helpers::emptyCollection( "local.pair.sync" ); if ( synced != 0 && notSynced != 0 ) return; notSynced = new PairSync(); @@ -71,7 +71,7 @@ namespace PairingTests { synced = new PairSync(); synced->init(); synced->setInitialSyncCompleted(); - Helpers::emptyCollection( "local.pair.sync" ); + Helpers::emptyCollection( "local.pair.sync" ); } PairSync *backup; static PairSync *synced; @@ -199,24 +199,24 @@ namespace PairingTests { TestableReplPair rp4( true, fromjson( "{ok:1,you_are:1}" ) ); rp4.arbitrate(); - ASSERT( rp4.state == ReplPair::State_Master ); + ASSERT( rp4.state == ReplPair::State_Master ); TestableReplPair rp5( true, fromjson( "{ok:1,you_are:0}" ) ); rp5.arbitrate(); - ASSERT( rp5.state == ReplPair::State_Slave ); + ASSERT( rp5.state == ReplPair::State_Slave ); TestableReplPair rp6( true, fromjson( "{ok:1,you_are:-1}" ) ); rp6.arbitrate(); // unchanged from initial value - ASSERT( rp6.state == ReplPair::State_Negotiating ); + ASSERT( rp6.state == ReplPair::State_Negotiating ); } private: class TestableReplPair : public ReplPair { public: TestableReplPair( bool connect, const BSONObj &one ) : - ReplPair( "a", "z" ), - connect_( connect ), - one_( one ) { + ReplPair( "a", "z" ), + connect_( connect ), + one_( one ) { } virtual DBClientConnection *newClientConnection() const { @@ -326,10 +326,10 @@ namespace PairingTests { class All : public Suite { public: - All() : Suite( "pairing" ){ + All() : Suite( "pairing" ) { } - - void setupTests(){ + + void setupTests() { add< ReplPairTests::Create >(); add< ReplPairTests::Dominant >(); add< ReplPairTests::SetMaster >(); |