Thread: [SQL-CVS] r4641 - SQLObject/branches/1.5/sqlobject/tests
SQLObject is a Python ORM.
Brought to you by:
ianbicking,
phd
From: <sub...@co...> - 2013-08-16 19:33:14
|
Author: phd Date: Fri Aug 16 13:33:02 2013 New Revision: 4641 Log: Minor changes for the case when all tests are running at once (not one by one) Modified: SQLObject/branches/1.5/sqlobject/tests/test_schema.py SQLObject/branches/1.5/sqlobject/tests/test_unicode.py Modified: SQLObject/branches/1.5/sqlobject/tests/test_schema.py ============================================================================== --- SQLObject/branches/1.5/sqlobject/tests/test_schema.py Wed Aug 14 11:16:03 2013 (r4640) +++ SQLObject/branches/1.5/sqlobject/tests/test_schema.py Fri Aug 16 13:33:02 2013 (r4641) @@ -5,7 +5,7 @@ ## Schema per connection ######################################## -class Test(SQLObject): +class TestSchema(SQLObject): foo = UnicodeCol(length=200) def test_connection_schema(): @@ -16,8 +16,9 @@ conn.query('CREATE SCHEMA test') conn.schema = 'test' conn.query('SET search_path TO test') - setupClass(Test) - Test(foo='bar') - assert conn.queryAll("SELECT * FROM test.test") + setupClass(TestSchema) + assert TestSchema._connection is conn + TestSchema(foo='bar') + assert conn.queryAll("SELECT * FROM test.test_schema") conn.schema = None conn.query('SET search_path TO public') Modified: SQLObject/branches/1.5/sqlobject/tests/test_unicode.py ============================================================================== --- SQLObject/branches/1.5/sqlobject/tests/test_unicode.py Wed Aug 14 11:16:03 2013 (r4640) +++ SQLObject/branches/1.5/sqlobject/tests/test_unicode.py Fri Aug 16 13:33:02 2013 (r4641) @@ -85,10 +85,6 @@ def test_dbEncoding(): setup() - assert TestUnicode.sqlmeta.dbEncoding is None - assert not hasattr(TestUnicode._connection, 'dbEncoding') or \ - TestUnicode._connection.dbEncoding is None - TestUnicode.sqlmeta.dbEncoding = 'utf-8' _test_select() TestUnicode.sqlmeta.dbEncoding = 'latin-1' @@ -104,3 +100,4 @@ TestUnicode._connection.dbEncoding = 'ascii' raises(UnicodeEncodeError, _test_select) del TestUnicode.sqlmeta.dbEncoding + TestUnicode._connection.dbEncoding = 'utf-8' |