Changed the delete_app() function to accept an App instance (#8)

Author: hiranya911

firebase_admin/__init__.py

@@ -58,31 +58,31 @@ def initialize_app(credential=None, options=None, name=_DEFAULT_APP_NAME):
             'you call initialize_app().').format(name))
 
 
-def delete_app(name):
+def delete_app(app):
     """Gracefully deletes an App instance.
 
     Args:
-      name: Name of the app instance to be deleted.
+      app: The app instance to be deleted.
 
     Raises:
-      ValueError: If the name is not a string.
+      ValueError: If the app is not initialized.
     """
-    if not isinstance(name, six.string_types):
-        raise ValueError('Illegal app name argument type: "{}". App name '
-                         'must be a string.'.format(type(name)))
+    if not isinstance(app, App):
+        raise ValueError('Illegal app argument type: "{}". Argument must be of '
+                         'type App.'.format(type(app)))
     with _apps_lock:
-        if name in _apps:
-            del _apps[name]
+        if _apps.get(app.name) is app:
+            del _apps[app.name]
             return
-    if name == _DEFAULT_APP_NAME:
+    if app.name == _DEFAULT_APP_NAME:
         raise ValueError(
-            'The default Firebase app does not exist. Make sure to initialize '
-            'the SDK by calling initialize_app().')
+            'The default Firebase app is not initialized. Make sure to initialize '
+            'the default app by calling initialize_app().')
     else:
         raise ValueError(
-            ('Firebase app named "{0}" does not exist. Make sure to initialize '
-             'the SDK by calling initialize_app() with your app name as the '
-             'second argument.').format(name))
+            ('Firebase app named "{0}" is not initialized. Make sure to initialize '
+             'the app by calling initialize_app() with your app name as the '
+             'second argument.').format(app.name))
 
 
 def get_app(name=_DEFAULT_APP_NAME):

tests/test_app.py

@@ -62,13 +62,24 @@ def app_credential(request):
     yield provider.get()
     provider.cleanup()
 
+@pytest.fixture(params=[None, 'myApp'], ids=['DefaultApp', 'CustomApp'])
+def init_app(request):
+    if request.param:
+        return firebase_admin.initialize_app(CREDENTIAL, name=request.param)
+    else:
+        return firebase_admin.initialize_app(CREDENTIAL)
+
 
 class TestFirebaseApp(object):
     """Test cases for App initialization and life cycle."""
 
     invalid_credentials = ['', 'foo', 0, 1, dict(), list(), tuple(), True, False]
     invalid_options = ['', 0, 1, list(), tuple(), True, False]
     invalid_names = [None, '', 0, 1, dict(), list(), tuple(), True, False]
+    invalid_apps = [
+        None, '', 0, 1, dict(), list(), tuple(), True, False,
+        firebase_admin.App('uninitialized', CREDENTIAL, {})
+    ]
 
     def teardown_method(self):
         testutils.cleanup_apps()
@@ -108,13 +119,8 @@ def test_app_init_with_invalid_name(self, name):
         with pytest.raises(ValueError):
             firebase_admin.initialize_app(CREDENTIAL, name=name)
 
-    def test_default_app_get(self):
-        app = firebase_admin.initialize_app(CREDENTIAL)
-        assert app is firebase_admin.get_app()
-
-    def test_non_default_app_get(self):
-        app = firebase_admin.initialize_app(CREDENTIAL, name='myApp')
-        assert app is firebase_admin.get_app('myApp')
+    def test_app_get(self, init_app):
+        assert init_app is firebase_admin.get_app(init_app.name)
 
     @pytest.mark.parametrize('args', [(), ('myApp',)],
                              ids=['DefaultApp', 'CustomApp'])
@@ -126,3 +132,16 @@ def test_non_existing_app_get(self, args):
     def test_app_get_with_invalid_name(self, name):
         with pytest.raises(ValueError):
             firebase_admin.get_app(name)
+
+    @pytest.mark.parametrize('app', invalid_apps)
+    def test_invalid_app_delete(self, app):
+        with pytest.raises(ValueError):
+            firebase_admin.delete_app(app)
+
+    def test_app_delete(self, init_app):
+        assert firebase_admin.get_app(init_app.name) is init_app
+        firebase_admin.delete_app(init_app)
+        with pytest.raises(ValueError):
+            firebase_admin.get_app(init_app.name)
+        with pytest.raises(ValueError):
+            firebase_admin.delete_app(init_app)

tests/test_auth.py

@@ -49,8 +49,8 @@ def setup_module():
     firebase_admin.initialize_app(MOCK_CREDENTIAL, name='testApp')
 
 def teardown_module():
-    firebase_admin.delete_app('[DEFAULT]')
-    firebase_admin.delete_app('testApp')
+    firebase_admin.delete_app(firebase_admin.get_app())
+    firebase_admin.delete_app(firebase_admin.get_app('testApp'))
 
 @pytest.fixture(params=[None, 'testApp'], ids=['DefaultApp', 'CustomApp'])
 def authtest(request):
@@ -73,7 +73,7 @@ def non_cert_app():
     """
     app = firebase_admin.initialize_app(credentials.Base(), name='non-cert-app')
     yield app
-    firebase_admin.delete_app(app.name)
+    firebase_admin.delete_app(app)
 
 def verify_custom_token(custom_token, expected_claims):
     assert isinstance(custom_token, six.binary_type)

tests/testutils.py

@@ -19,9 +19,9 @@ def resource(filename):
 
 def cleanup_apps():
     with firebase_admin._apps_lock:
-        app_names = list(firebase_admin._apps.keys())
-        for name in app_names:
-            firebase_admin.delete_app(name)
+        apps = list(firebase_admin._apps.values())
+        for app in apps:
+            firebase_admin.delete_app(app)
 
 
 class HttpMock(object):