From e17edb3240e9707d25a35456ce277d2ee8d332f5 Mon Sep 17 00:00:00 2001 From: Jason Kirtland Date: Mon, 17 Mar 2008 21:59:02 +0000 Subject: [PATCH] - trailing whitespace... --- test/orm/session.py | 86 ++++++++++++++++++++++----------------------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/test/orm/session.py b/test/orm/session.py index 39018e8f2a..e4b42ab1cb 100644 --- a/test/orm/session.py +++ b/test/orm/session.py @@ -99,19 +99,19 @@ class SessionTest(TestBase, AssertsExecutionResults): sess.execute(users.insert(), params=dict(user_id=2, user_name='fred')) assert sess.execute(users.select()).fetchall() == [(1, 'ed'), (2, 'fred')] sess.close() - + @engines.close_open_connections def test_bind_from_metadata(self): Session = sessionmaker() sess = Session() mapper(User, users) - + sess.execute(users.insert(), dict(user_name='Johnny')) - + assert len(sess.query(User).all()) == 1 - + sess.execute(users.delete()) - + assert len(sess.query(User).all()) == 0 sess.close() @@ -164,12 +164,12 @@ class SessionTest(TestBase, AssertsExecutionResults): 'addresses':relation(Address, backref="user") }) mapper(Address, addresses) - + sess = create_session(autoflush=True, transactional=True) u = User(user_name='ed', addresses=[Address(email_address='foo')]) sess.save(u) self.assertEquals(sess.query(Address).filter(Address.user==u).one(), Address(email_address='foo')) - + @testing.unsupported('sqlite', 'mssql') # TEMP: test causes mssql to hang @engines.close_open_connections def test_autoflush_unbound(self): @@ -391,116 +391,116 @@ class SessionTest(TestBase, AssertsExecutionResults): def test_nested_transaction_connection_add(self): class User(object): pass mapper(User, users) - + sess = create_session(transactional=False) - + sess.begin() sess.begin_nested() - + u1 = User() sess.save(u1) sess.flush() - + sess.rollback() - + u2 = User() sess.save(u2) - + sess.commit() - + self.assertEquals(util.Set(sess.query(User).all()), util.Set([u2])) - + sess.begin() sess.begin_nested() - + u3 = User() sess.save(u3) sess.commit() # commit the nested transaction sess.rollback() - + self.assertEquals(util.Set(sess.query(User).all()), util.Set([u2])) - + sess.close() - + @testing.unsupported('sqlite', 'mssql', 'firebird', 'sybase', 'access', 'oracle', 'maxdb') @testing.exclude('mysql', '<', (5, 0, 3)) def test_mixed_transaction_control(self): class User(object): pass mapper(User, users) - + sess = create_session(transactional=False) - + sess.begin() sess.begin_nested() transaction = sess.begin() - + sess.save(User()) - + transaction.commit() sess.commit() sess.commit() - + sess.close() - + self.assertEquals(len(sess.query(User).all()), 1) - + t1 = sess.begin() t2 = sess.begin_nested() - + sess.save(User()) - + t2.commit() assert sess.transaction is t1 - + sess.close() - + @testing.unsupported('sqlite', 'mssql', 'firebird', 'sybase', 'access', 'oracle', 'maxdb') @testing.exclude('mysql', '<', (5, 0, 3)) def test_mixed_transaction_close(self): class User(object): pass mapper(User, users) - + sess = create_session(transactional=True) - + sess.begin_nested() - + sess.save(User()) sess.flush() - + sess.close() - + sess.save(User()) sess.commit() - + sess.close() - + self.assertEquals(len(sess.query(User).all()), 1) - + @testing.unsupported('sqlite', 'mssql', 'firebird', 'sybase', 'access', 'oracle', 'maxdb') @testing.exclude('mysql', '<', (5, 0, 3)) def test_error_on_using_inactive_session(self): class User(object): pass mapper(User, users) - + sess = create_session(transactional=False) - + try: sess.begin() sess.begin() - + sess.save(User()) sess.flush() - + sess.rollback() sess.begin() assert False except exceptions.InvalidRequestError, e: self.assertEquals(str(e), "The transaction is inactive due to a rollback in a subtransaction and should be closed") sess.close() - + @engines.close_open_connections def test_bound_connection(self): class User(object):pass -- 2.47.3