From 9c0d696b7e9e51caf79b96d65d02528041ebeecb Mon Sep 17 00:00:00 2001
From: Rodolphe Marques <marques.rodolphe@gmail.com>
Date: Wed, 21 Dec 2016 16:52:57 +0100
Subject: [PATCH] Better unittests

Simplify code
---
 bigchaindb/backend/mongodb/schema.py | 12 +++++-------
 tests/backend/mongodb/test_schema.py | 18 +++++++++++++++++-
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/bigchaindb/backend/mongodb/schema.py b/bigchaindb/backend/mongodb/schema.py
index cc729b0f..7eaff782 100644
--- a/bigchaindb/backend/mongodb/schema.py
+++ b/bigchaindb/backend/mongodb/schema.py
@@ -104,11 +104,10 @@ def initialize_replica_set(conn):
         if exc_info.details['codeName'] == 'AlreadyInitialized':
             logger.info('Replica set already initialized')
             return
-        else:
-            raise
-
-    _wait_for_replica_set_initialization(conn)
-    logger.info('Initialized replica set')
+        raise
+    else:
+        _wait_for_replica_set_initialization(conn)
+        logger.info('Initialized replica set')
 
 
 def _get_replica_set_name(conn):
@@ -151,7 +150,6 @@ def _wait_for_replica_set_initialization(conn):
     logger.info('Waiting for mongodb replica set initialization')
     while True:
         logs = conn.conn.admin.command('getLog', 'rs')['log']
-        for line in logs:
-            if 'database writes are now permitted' in line:
+        if any('database writes are now permitted' in line for line in logs):
                 return
         time.sleep(0.1)
diff --git a/tests/backend/mongodb/test_schema.py b/tests/backend/mongodb/test_schema.py
index c654ad5a..033d4113 100644
--- a/tests/backend/mongodb/test_schema.py
+++ b/tests/backend/mongodb/test_schema.py
@@ -107,7 +107,7 @@ def test_drop():
     assert dbname not in conn.conn.database_names()
 
 
-def test_get_replica_set_name():
+def test_get_replica_set_name_not_enabled():
     from pymongo.database import Database
     from bigchaindb import backend
     from bigchaindb.backend.mongodb.schema import _get_replica_set_name
@@ -123,6 +123,14 @@ def test_get_replica_set_name():
         with pytest.raises(ConfigurationError):
             _get_replica_set_name(conn)
 
+
+def test_get_replica_set_name_command_line():
+    from pymongo.database import Database
+    from bigchaindb import backend
+    from bigchaindb.backend.mongodb.schema import _get_replica_set_name
+
+    conn = backend.connect()
+
     # replSet option set through the command line
     cmd_line_opts = {'argv': ['mongod', '--dbpath=/data', '--replSet=rs0'],
                      'ok': 1.0,
@@ -131,6 +139,14 @@ def test_get_replica_set_name():
     with patch.object(Database, 'command', return_value=cmd_line_opts):
         assert _get_replica_set_name(conn) == 'rs0'
 
+
+def test_get_replica_set_name_config_file():
+    from pymongo.database import Database
+    from bigchaindb import backend
+    from bigchaindb.backend.mongodb.schema import _get_replica_set_name
+
+    conn = backend.connect()
+
     # replSet option set through the config file
     cmd_line_opts = {'argv': ['mongod', '--dbpath=/data', '--replSet=rs0'],
                      'ok': 1.0,