devtools/testlib.py
changeset 7398 26695dd703d8
parent 7377 d8083b2ae4d6
child 7436 28ec860c4436
equal deleted inserted replaced
7397:6a9e66d788b3 7398:26695dd703d8
   272 
   272 
   273     @property
   273     @property
   274     def session(self):
   274     def session(self):
   275         """return current server side session (using default manager account)"""
   275         """return current server side session (using default manager account)"""
   276         session = self.repo._sessions[self.cnx.sessionid]
   276         session = self.repo._sessions[self.cnx.sessionid]
   277         session.set_pool()
   277         session.set_cnxset()
   278         return session
   278         return session
   279 
   279 
   280     @property
   280     @property
   281     def adminsession(self):
   281     def adminsession(self):
   282         """return current server side session (using default manager account)"""
   282         """return current server side session (using default manager account)"""
   456     @nocoverage
   456     @nocoverage
   457     def commit(self):
   457     def commit(self):
   458         try:
   458         try:
   459             return self.cnx.commit()
   459             return self.cnx.commit()
   460         finally:
   460         finally:
   461             self.session.set_pool() # ensure pool still set after commit
   461             self.session.set_cnxset() # ensure cnxset still set after commit
   462 
   462 
   463     @nocoverage
   463     @nocoverage
   464     def rollback(self):
   464     def rollback(self):
   465         try:
   465         try:
   466             self.cnx.rollback()
   466             self.cnx.rollback()
   467         except dbapi.ProgrammingError:
   467         except dbapi.ProgrammingError:
   468             pass # connection closed
   468             pass # connection closed
   469         finally:
   469         finally:
   470             self.session.set_pool() # ensure pool still set after commit
   470             self.session.set_cnxset() # ensure cnxset still set after commit
   471 
   471 
   472     # # server side db api #######################################################
   472     # # server side db api #######################################################
   473 
   473 
   474     def sexecute(self, rql, args=None, eid_key=None):
   474     def sexecute(self, rql, args=None, eid_key=None):
   475         if eid_key is not None:
   475         if eid_key is not None:
   476             warn('[3.8] eid_key is deprecated, you can safely remove this argument',
   476             warn('[3.8] eid_key is deprecated, you can safely remove this argument',
   477                  DeprecationWarning, stacklevel=2)
   477                  DeprecationWarning, stacklevel=2)
   478         self.session.set_pool()
   478         self.session.set_cnxset()
   479         return self.session.execute(rql, args)
   479         return self.session.execute(rql, args)
   480 
   480 
   481     # other utilities #########################################################
   481     # other utilities #########################################################
   482 
   482 
   483     @contextmanager
   483     @contextmanager