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] 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