From 09866920af8ae5b197dc45eb976ebf2c0cb0d1bd Mon Sep 17 00:00:00 2001
From: Anuj <anuj.ism@gmail.com>
Date: Sun, 2 Apr 2017 17:53:39 +0530
Subject: [PATCH 1/3] Pretty message when dropping a non-existent database

---
 bigchaindb/commands/bigchain.py |  8 ++++++--
 tests/commands/test_commands.py | 12 ++++++++++++
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/bigchaindb/commands/bigchain.py b/bigchaindb/commands/bigchain.py
index be17d75f..ce0cbfa0 100644
--- a/bigchaindb/commands/bigchain.py
+++ b/bigchaindb/commands/bigchain.py
@@ -12,7 +12,8 @@ import sys
 from bigchaindb.common import crypto
 from bigchaindb.common.exceptions import (StartupError,
                                           DatabaseAlreadyExists,
-                                          KeypairNotFoundException)
+                                          KeypairNotFoundException,
+                                          DatabaseDoesNotExist)
 import bigchaindb
 from bigchaindb import backend, processes
 from bigchaindb.backend import schema
@@ -166,7 +167,10 @@ def run_drop(args):
 
     conn = backend.connect()
     dbname = bigchaindb.config['database']['name']
-    schema.drop_database(conn, dbname)
+    try:
+        schema.drop_database(conn, dbname)
+    except DatabaseDoesNotExist:
+        print("Cannot drop '{name}'. The database does not exist.".format(name=dbname), file=sys.stderr)
 
 
 @configure_bigchaindb
diff --git a/tests/commands/test_commands.py b/tests/commands/test_commands.py
index 50b995b0..ad603351 100644
--- a/tests/commands/test_commands.py
+++ b/tests/commands/test_commands.py
@@ -149,6 +149,18 @@ def test_drop_db_when_interactive_yes(mock_db_drop, monkeypatch):
     assert mock_db_drop.called
 
 
+@patch('bigchaindb.backend.schema.drop_database')
+def test_drop_db_when_db_does_not_exist(mock_db_drop, capsys):
+    from bigchaindb.commands.bigchain import run_drop
+    from bigchaindb.common.exceptions import DatabaseDoesNotExist
+    args = Namespace(config=None, yes=True)
+    mock_db_drop.side_effect = DatabaseDoesNotExist
+
+    run_drop(args)
+    output_message = capsys.readouterr()[1]
+    assert output_message == "Cannot drop 'bigchain'. The database does not exist.\n"
+
+
 @patch('bigchaindb.backend.schema.drop_database')
 def test_drop_db_does_not_drop_when_interactive_no(mock_db_drop, monkeypatch):
     from bigchaindb.commands.bigchain import run_drop

From c3f89fd447e7729dad98b521c5c484311e1e2a8a Mon Sep 17 00:00:00 2001
From: Anuj <anuj.ism@gmail.com>
Date: Mon, 3 Apr 2017 13:13:22 +0530
Subject: [PATCH 2/3] Taking DB name from config in test for non-existent db
 drop

---
 tests/commands/test_commands.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/commands/test_commands.py b/tests/commands/test_commands.py
index ad603351..c0e2b5af 100644
--- a/tests/commands/test_commands.py
+++ b/tests/commands/test_commands.py
@@ -151,6 +151,7 @@ def test_drop_db_when_interactive_yes(mock_db_drop, monkeypatch):
 
 @patch('bigchaindb.backend.schema.drop_database')
 def test_drop_db_when_db_does_not_exist(mock_db_drop, capsys):
+    from bigchaindb import config
     from bigchaindb.commands.bigchain import run_drop
     from bigchaindb.common.exceptions import DatabaseDoesNotExist
     args = Namespace(config=None, yes=True)
@@ -158,7 +159,8 @@ def test_drop_db_when_db_does_not_exist(mock_db_drop, capsys):
 
     run_drop(args)
     output_message = capsys.readouterr()[1]
-    assert output_message == "Cannot drop 'bigchain'. The database does not exist.\n"
+    assert output_message == "Cannot drop '{name}'. The database does not exist.\n".format(
+        name=config['database']['name'])
 
 
 @patch('bigchaindb.backend.schema.drop_database')

From bb68a44b9674fd0a10f38254188b5526400eaba8 Mon Sep 17 00:00:00 2001
From: Anuj <anuj.ism@gmail.com>
Date: Tue, 4 Apr 2017 13:55:24 +0530
Subject: [PATCH 3/3] Renamed bigchain import to bigchaindb

---
 tests/commands/test_commands.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/commands/test_commands.py b/tests/commands/test_commands.py
index 2670725a..6fb424d6 100644
--- a/tests/commands/test_commands.py
+++ b/tests/commands/test_commands.py
@@ -152,7 +152,7 @@ def test_drop_db_when_interactive_yes(mock_db_drop, monkeypatch):
 @patch('bigchaindb.backend.schema.drop_database')
 def test_drop_db_when_db_does_not_exist(mock_db_drop, capsys):
     from bigchaindb import config
-    from bigchaindb.commands.bigchain import run_drop
+    from bigchaindb.commands.bigchaindb import run_drop
     from bigchaindb.common.exceptions import DatabaseDoesNotExist
     args = Namespace(config=None, yes=True)
     mock_db_drop.side_effect = DatabaseDoesNotExist