[SQL-CVS] r4636 - in SQLObject/trunk/sqlobject: inheritance/tests tests

[<sub...@co...>]

Author: phd
Date: Wed Aug 14 09:19:06 2013
New Revision: 4636

Log:
Merged revision 4635 from branch 1.5: test fixes by Neil Muller

Modified:
   SQLObject/trunk/sqlobject/inheritance/tests/test_asdict.py
   SQLObject/trunk/sqlobject/inheritance/tests/test_deep_inheritance.py
   SQLObject/trunk/sqlobject/inheritance/tests/test_foreignKey.py
   SQLObject/trunk/sqlobject/tests/dbtest.py
   SQLObject/trunk/sqlobject/tests/test_cyclic_reference.py
   SQLObject/trunk/sqlobject/tests/test_schema.py
   SQLObject/trunk/sqlobject/tests/test_transactions.py

Modified: SQLObject/trunk/sqlobject/inheritance/tests/test_asdict.py
==============================================================================
--- SQLObject/trunk/sqlobject/inheritance/tests/test_asdict.py	Wed Aug 14 09:15:14 2013	(r4635)
+++ SQLObject/trunk/sqlobject/inheritance/tests/test_asdict.py	Wed Aug 14 09:19:06 2013	(r4636)
@@ -29,7 +29,7 @@
         assert _columns == columns
 
 def test_asDict():
-    setupClass([InheritablePersonAD, ManagerAD, EmployeeAD])
+    setupClass([InheritablePersonAD, ManagerAD, EmployeeAD], force=True)
     InheritablePersonAD(firstName='Oneof', lastName='Authors')
     ManagerAD(firstName='ManagerAD', lastName='The', department='Dep')
     EmployeeAD(firstName='Project', lastName='Leader', position='Project leader')

Modified: SQLObject/trunk/sqlobject/inheritance/tests/test_deep_inheritance.py
==============================================================================
--- SQLObject/trunk/sqlobject/inheritance/tests/test_deep_inheritance.py	Wed Aug 14 09:15:14 2013	(r4635)
+++ SQLObject/trunk/sqlobject/inheritance/tests/test_deep_inheritance.py	Wed Aug 14 09:19:06 2013	(r4636)
@@ -72,7 +72,8 @@
     person_id = DIPerson(firstName='Oneof', lastName='Authors',
         manager=manager).id
 
-    cache = getConnection().cache
+    conn = getConnection()
+    cache = conn.cache
     cache.clear()
 
     managers = list(DIManager.select())
@@ -97,3 +98,4 @@
 
     person = DIEmployee.get(manager_id)
     assert isinstance(person, DIManager)
+    conn.close()

Modified: SQLObject/trunk/sqlobject/inheritance/tests/test_foreignKey.py
==============================================================================
--- SQLObject/trunk/sqlobject/inheritance/tests/test_foreignKey.py	Wed Aug 14 09:15:14 2013	(r4635)
+++ SQLObject/trunk/sqlobject/inheritance/tests/test_foreignKey.py	Wed Aug 14 09:19:06 2013	(r4636)
@@ -19,7 +19,7 @@
     paper = ForeignKey("Paper", default=None)
 
 def test_foreignKey():
-    setupClass([Note, PersonWithNotes, Paper, EmployeeWithNotes])
+    setupClass([Note, PersonWithNotes, Paper, EmployeeWithNotes], force=True)
 
     note = Note(text="person")
     PersonWithNotes(firstName='Oneof', lastName='Authors', note=note)

Modified: SQLObject/trunk/sqlobject/tests/dbtest.py
==============================================================================
--- SQLObject/trunk/sqlobject/tests/dbtest.py	Wed Aug 14 09:15:14 2013	(r4635)
+++ SQLObject/trunk/sqlobject/tests/dbtest.py	Wed Aug 14 09:19:06 2013	(r4636)
@@ -40,7 +40,7 @@
 supportsMatrix = {
     '+exceptions': 'mysql postgres sqlite',
     '-transactions': 'mysql rdbhost',
-    '-dropTableCascade': 'sybase mssql',
+    '-dropTableCascade': 'sybase mssql mysql',
     '-expressionIndex': 'mysql sqlite firebird mssql',
     '-blobData': 'mssql rdbhost',
     '-decimalColumn': 'mssql',

Modified: SQLObject/trunk/sqlobject/tests/test_cyclic_reference.py
==============================================================================
--- SQLObject/trunk/sqlobject/tests/test_cyclic_reference.py	Wed Aug 14 09:15:14 2013	(r4635)
+++ SQLObject/trunk/sqlobject/tests/test_cyclic_reference.py	Wed Aug 14 09:19:06 2013	(r4636)
@@ -24,6 +24,8 @@
     fkeya = ForeignKey('TestCyclicReferenceA') 
 
 def test_cyclic_reference():
+    if not supports('dropTableCascade'):
+        return
     conn = getConnection()
     TestCyclicReferenceA.setConnection(conn)
     TestCyclicReferenceB.setConnection(conn)

Modified: SQLObject/trunk/sqlobject/tests/test_schema.py
==============================================================================
--- SQLObject/trunk/sqlobject/tests/test_schema.py	Wed Aug 14 09:15:14 2013	(r4635)
+++ SQLObject/trunk/sqlobject/tests/test_schema.py	Wed Aug 14 09:19:06 2013	(r4636)
@@ -19,3 +19,5 @@
     setupClass(Test)
     Test(foo='bar')
     assert conn.queryAll("SELECT * FROM test.test")
+    conn.schema = None
+    conn.query('SET search_path TO public')

Modified: SQLObject/trunk/sqlobject/tests/test_transactions.py
==============================================================================
--- SQLObject/trunk/sqlobject/tests/test_transactions.py	Wed Aug 14 09:15:14 2013	(r4635)
+++ SQLObject/trunk/sqlobject/tests/test_transactions.py	Wed Aug 14 09:19:06 2013	(r4636)
@@ -75,6 +75,7 @@
     finally:
         trans.rollback()
         connection.autoCommit = True
+        connection.close()
 
 def test_transaction_delete_with_close():
     test_transaction_delete(close=True)