From 8faf71fdabec1c18af4de3291adb2eb5bfd8a1e7 Mon Sep 17 00:00:00 2001
From: Tim Simpson <tim.simpson@rackspace.com>
Date: Thu, 2 Feb 2012 17:32:29 -0600
Subject: Increased coverage of nova/auth/dbdriver.py to 100%. Fixes 828609.

Change-Id: Iefa36ced27328ad79b9d58f04d915178b9b63bcc
---
 nova/auth/dbdriver.py | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

(limited to 'nova/auth')

diff --git a/nova/auth/dbdriver.py b/nova/auth/dbdriver.py
index a84e11e66..1d337fee9 100644
--- a/nova/auth/dbdriver.py
+++ b/nova/auth/dbdriver.py
@@ -78,7 +78,7 @@ class DbDriver(object):
         try:
             user_ref = db.user_create(context.get_admin_context(), values)
             return self._db_user_to_auth_user(user_ref)
-        except exception.Duplicate, e:
+        except (exception.Duplicate, exception.DBError) as e:
             raise exception.UserExists(user=name)
 
     def _db_user_to_auth_user(self, user_ref):
@@ -100,8 +100,6 @@ class DbDriver(object):
                        description=None, member_uids=None):
         """Create a project"""
         manager = db.user_get(context.get_admin_context(), manager_uid)
-        if not manager:
-            raise exception.UserNotFound(user_id=manager_uid)
 
         # description is a required attribute
         if description is None:
@@ -114,8 +112,6 @@ class DbDriver(object):
         if member_uids is not None:
             for member_uid in member_uids:
                 member = db.user_get(context.get_admin_context(), member_uid)
-                if not member:
-                    raise exception.UserNotFound(user_id=member_uid)
                 members.add(member)
 
         values = {'id': name,
@@ -146,8 +142,6 @@ class DbDriver(object):
         values = {}
         if manager_uid:
             manager = db.user_get(context.get_admin_context(), manager_uid)
-            if not manager:
-                raise exception.UserNotFound(user_id=manager_uid)
             values['project_manager'] = manager['id']
         if description:
             values['description'] = description
@@ -234,9 +228,5 @@ class DbDriver(object):
 
     def _validate_user_and_project(self, user_id, project_id):
         user = db.user_get(context.get_admin_context(), user_id)
-        if not user:
-            raise exception.UserNotFound(user_id=user_id)
         project = db.project_get(context.get_admin_context(), project_id)
-        if not project:
-            raise exception.ProjectNotFound(project_id=project_id)
         return user, project
-- 
cgit