Merge branch 'master' into hkj-fcm-api

Author: hiranya911

firebase_admin/_user_mgt.py

@@ -320,7 +320,7 @@ def delete_user(self, uid):
         """Deletes the user identified by the specified user ID."""
         _Validator.validate_uid(uid)
         try:
-            response = self._request('post', 'deleteAccount', json={'localId' : [uid]})
+            response = self._request('post', 'deleteAccount', json={'localId' : uid})
         except requests.exceptions.RequestException as error:
             self._handle_http_error(
                 USER_DELETE_ERROR, 'Failed to delete user: {0}.'.format(uid), error)

integration/test_instance_id.py

@@ -20,5 +20,6 @@
 
 def test_delete_non_existing():
     with pytest.raises(instance_id.ApiCallError) as excinfo:
-        instance_id.delete_instance_id('non-existing')
-    assert str(excinfo.value) == 'Instance ID "non-existing": Failed to find the instance ID.'
+        # legal instance IDs are /[cdef][A-Za-z0-9_-]{9}[AEIMQUYcgkosw048]/
+        instance_id.delete_instance_id('fictive-ID0')
+    assert str(excinfo.value) == 'Instance ID "fictive-ID0": Failed to find the instance ID.'