x/tuskar
Code Issues Proposed changes

Merge "Add object_type to tuskar storage exceptions"

Browse Source
This commit is contained in:
Jenkins 2014-08-22 19:33:02 +00:00 committed by Gerrit Code Review
commit 3e1fdad58a
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tuskar/storage/drivers/sqlalchemy.py
View File

@ -128,7 +128,10 @@ class SQLAlchemyDriver(BaseDriver):
if name is not None: if name is not None:
try: try:
self.retrieve_by_name(store, name) self.retrieve_by_name(store, name)
msg = "A file with the name '{0}' already exists".format(name) msg = "A {0} with the name '{1}' already exists".format(
store.object_type,
name
)
raise NameAlreadyUsed(msg) raise NameAlreadyUsed(msg)
except UnknownName: except UnknownName:
pass pass
@ -144,7 +147,7 @@ class SQLAlchemyDriver(BaseDriver):
object_type=object_type object_type=object_type
).one() ).one()
except NoResultFound: except NoResultFound:
msg = "No results found for the UUID: {0}".format(uuid) msg = "No {0}s for the UUID: {1}".format(object_type, uuid)
raise UnknownUUID(msg) raise UnknownUUID(msg)
finally: finally:
session.close() session.close()
@ -333,10 +336,16 @@ class SQLAlchemyDriver(BaseDriver):
) )
if name_query.count() == 0: if name_query.count() == 0:
msg = "No results found for the Name: {0}".format(name) msg = "No {0}s found for the name: {1}".format(
object_type,
name
)
raise UnknownName(msg) raise UnknownName(msg)
elif name_query.filter_by(version=version).count() == 0: elif name_query.filter_by(version=version).count() == 0:
msg = "No results found for the Version: {0}".format(version) msg = "No {0}s found for the Version: {1}".format(
object_type,
name
)
raise UnknownVersion(msg) raise UnknownVersion(msg)
raise raise