# HG changeset patch # User Sylvain Thénault # Date 1316622939 -7200 # Node ID cb6174065c39d231d737f800941c357032e17e05 # Parent 2a164a9cf81c8a1ef41cb16467cd1fd88ae839ca [test] fix test broken by 7815:2a164a9cf81c diff -r 2a164a9cf81c -r cb6174065c39 web/test/unittest_session.py --- a/web/test/unittest_session.py Wed Sep 21 17:38:00 2011 +0200 +++ b/web/test/unittest_session.py Wed Sep 21 18:35:39 2011 +0200 @@ -2,7 +2,7 @@ """unit tests for cubicweb.web.application :organization: Logilab -:copyright: 2001-2010 LOGILAB S.A. (Paris, FRANCE), license is LGPL v2. +:copyright: 2001-2011 LOGILAB S.A. (Paris, FRANCE), license is LGPL v2. :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr :license: GNU Lesser General Public License, v2.1 - http://www.gnu.org/licenses """ diff -r 2a164a9cf81c -r cb6174065c39 web/views/sessions.py --- a/web/views/sessions.py Wed Sep 21 17:38:00 2011 +0200 +++ b/web/views/sessions.py Wed Sep 21 18:35:39 2011 +0200 @@ -21,7 +21,8 @@ __docformat__ = "restructuredtext en" -from cubicweb import RepositoryError, Unauthorized, AuthenticationError +from cubicweb import (RepositoryError, Unauthorized, AuthenticationError, + BadConnectionId) from cubicweb.web import InvalidSession, Redirect from cubicweb.web.application import AbstractSessionManager from cubicweb.dbapi import DBAPISession @@ -130,5 +131,8 @@ self.info('closing http session %s' % session.sessionid) del self._sessions[session.sessionid] if session.cnx: - session.cnx.close() + try: + session.cnx.close() + except BadConnectionId: # expired on the repository side + pass session.cnx = None