# HG changeset patch # User Julien Jehannet # Date 1294237976 -3600 # Node ID 5062d86d6ffebf4b1becce5c879a31c54dbf6639 # Parent 92e4c07f86c0bc6e3163760dea1b7bf9b15b12d1 [unittest2] use unittest2 module fixture api diff -r 92e4c07f86c0 -r 5062d86d6ffe hooks/test/unittest_syncschema.py --- a/hooks/test/unittest_syncschema.py Wed Jan 05 15:32:22 2011 +0100 +++ b/hooks/test/unittest_syncschema.py Wed Jan 05 15:32:56 2011 +0100 @@ -24,7 +24,7 @@ from cubicweb.server.sqlutils import SQL_PREFIX from cubicweb.devtools.repotest import schema_eids_idx, restore_schema_eids_idx -def teardown_module(*args): +def tearDownModule(*args): del SchemaModificationHooksTC.schema_eids class SchemaModificationHooksTC(CubicWebTC): diff -r 92e4c07f86c0 -r 5062d86d6ffe server/test/unittest_hook.py --- a/server/test/unittest_hook.py Wed Jan 05 15:32:22 2011 +0100 +++ b/server/test/unittest_hook.py Wed Jan 05 15:32:56 2011 +0100 @@ -79,7 +79,7 @@ config.bootstrap_cubes() schema = config.load_schema() -def teardown_module(*args): +def tearDownModule(*args): global config, schema del config, schema diff -r 92e4c07f86c0 -r 5062d86d6ffe server/test/unittest_ldapuser.py --- a/server/test/unittest_ldapuser.py Wed Jan 05 15:32:22 2011 +0100 +++ b/server/test/unittest_ldapuser.py Wed Jan 05 15:32:56 2011 +0100 @@ -70,13 +70,13 @@ # don't check upassword ! return self.extid2eid(user['dn'], 'CWUser', session) -def setup_module(*args): +def setUpModule(*args): global repo LDAPUserSourceTC._init_repo() repo = LDAPUserSourceTC.repo add_ldap_source(LDAPUserSourceTC.cnx) -def teardown_module(*args): +def tearDownModule(*args): global repo repo.shutdown() del repo diff -r 92e4c07f86c0 -r 5062d86d6ffe server/test/unittest_migractions.py --- a/server/test/unittest_migractions.py Wed Jan 05 15:32:22 2011 +0100 +++ b/server/test/unittest_migractions.py Wed Jan 05 15:32:56 2011 +0100 @@ -34,7 +34,7 @@ from cubicweb.server.migractions import * migrschema = None -def teardown_module(*args): +def tearDownModule(*args): global migrschema del migrschema del MigrationCommandsTC.origschema diff -r 92e4c07f86c0 -r 5062d86d6ffe server/test/unittest_msplanner.py --- a/server/test/unittest_msplanner.py Wed Jan 05 15:32:22 2011 +0100 +++ b/server/test/unittest_msplanner.py Wed Jan 05 15:32:56 2011 +0100 @@ -76,11 +76,11 @@ # keep cnx so it's not garbage collected and the associated session is closed -def setup_module(*args): +def setUpModule(*args): global repo, cnx repo, cnx = init_test_database(apphome=BaseMSPlannerTC.datadir) -def teardown_module(*args): +def tearDownModule(*args): global repo, cnx del repo, cnx diff -r 92e4c07f86c0 -r 5062d86d6ffe server/test/unittest_multisources.py --- a/server/test/unittest_multisources.py Wed Jan 05 15:32:22 2011 +0100 +++ b/server/test/unittest_multisources.py Wed Jan 05 15:32:56 2011 +0100 @@ -46,7 +46,7 @@ PyroRQLSource_get_connection = PyroRQLSource.get_connection Connection_close = Connection.close -def setup_module(*args): +def setUpModule(*args): global repo2, cnx2, repo3, cnx3 cfg1 = ExternalSource1Configuration('data', apphome=TwoSourcesTC.datadir) repo2, cnx2 = init_test_database(config=cfg1) @@ -64,7 +64,7 @@ # pool though we want to keep cnx2 valid Connection.close = lambda x: None -def teardown_module(*args): +def tearDownModule(*args): PyroRQLSource.get_connection = PyroRQLSource_get_connection Connection.close = Connection_close global repo2, cnx2, repo3, cnx3 diff -r 92e4c07f86c0 -r 5062d86d6ffe server/test/unittest_querier.py --- a/server/test/unittest_querier.py Wed Jan 05 15:32:22 2011 +0100 +++ b/server/test/unittest_querier.py Wed Jan 05 15:32:56 2011 +0100 @@ -62,11 +62,11 @@ ('C0 text,C1 integer', {'A': 'table0.C0', 'B': 'table0.C1'})) -def setup_module(*args): +def setUpModule(*args): global repo, cnx repo, cnx = init_test_database(apphome=UtilsTC.datadir) -def teardown_module(*args): +def tearDownModule(*args): global repo, cnx cnx.close() repo.shutdown() diff -r 92e4c07f86c0 -r 5062d86d6ffe server/test/unittest_rql2sql.py --- a/server/test/unittest_rql2sql.py Wed Jan 05 15:32:22 2011 +0100 +++ b/server/test/unittest_rql2sql.py Wed Jan 05 15:32:56 2011 +0100 @@ -38,7 +38,7 @@ pass # already registered -def setup_module(*args): +def setUpModule(): global config, schema config = TestServerConfiguration('data', apphome=CWRQLTC.datadir) config.bootstrap_cubes() @@ -47,7 +47,7 @@ schema['state_of'].inlined = False schema['comments'].inlined = False -def teardown_module(*args): +def tearDownModule(): global config, schema del config, schema diff -r 92e4c07f86c0 -r 5062d86d6ffe server/test/unittest_rqlannotation.py --- a/server/test/unittest_rqlannotation.py Wed Jan 05 15:32:22 2011 +0100 +++ b/server/test/unittest_rqlannotation.py Wed Jan 05 15:32:56 2011 +0100 @@ -22,11 +22,11 @@ from cubicweb.devtools.repotest import BaseQuerierTC -def setup_module(*args): +def setUpModule(*args): global repo, cnx repo, cnx = init_test_database(apphome=SQLGenAnnotatorTC.datadir) -def teardown_module(*args): +def tearDownModule(*args): global repo, cnx del repo, cnx diff -r 92e4c07f86c0 -r 5062d86d6ffe server/test/unittest_schemaserial.py --- a/server/test/unittest_schemaserial.py Wed Jan 05 15:32:22 2011 +0100 +++ b/server/test/unittest_schemaserial.py Wed Jan 05 15:32:56 2011 +0100 @@ -25,14 +25,14 @@ from cubicweb.schema import CubicWebSchemaLoader from cubicweb.devtools import TestServerConfiguration -def setup_module(*args): +def setUpModule(*args): global schema, config loader = CubicWebSchemaLoader() config = TestServerConfiguration('data', apphome=Schema2RQLTC.datadir) config.bootstrap_cubes() schema = loader.load(config) -def teardown_module(*args): +def tearDownModule(*args): global schema, config del schema, config diff -r 92e4c07f86c0 -r 5062d86d6ffe server/test/unittest_ssplanner.py --- a/server/test/unittest_ssplanner.py Wed Jan 05 15:32:22 2011 +0100 +++ b/server/test/unittest_ssplanner.py Wed Jan 05 15:32:56 2011 +0100 @@ -21,11 +21,11 @@ from cubicweb.server.ssplanner import SSPlanner # keep cnx so it's not garbage collected and the associated session closed -def setup_module(*args): +def setUpModule(*args): global repo, cnx repo, cnx = init_test_database(apphome=SSPlannerTC.datadir) -def teardown_module(*args): +def tearDownModule(*args): global repo, cnx del repo, cnx diff -r 92e4c07f86c0 -r 5062d86d6ffe skeleton/test/realdb_test_CUBENAME.py --- a/skeleton/test/realdb_test_CUBENAME.py Wed Jan 05 15:32:22 2011 +0100 +++ b/skeleton/test/realdb_test_CUBENAME.py Wed Jan 05 15:32:56 2011 +0100 @@ -21,7 +21,7 @@ from cubicweb.devtools import buildconfig, loadconfig from cubicweb.devtools.testlib import RealDBTest -def setup_module(options): +def setUpModule(options): if options.source: configcls = loadconfig(options.source) elif options.dbname is None: @@ -33,7 +33,7 @@ RealDatabaseTC.configcls = configcls class RealDatabaseTC(RealDBTest): - configcls = None # set by setup_module() + configcls = None # set by setUpModule() def test_all_primaries(self): for rset in self.iter_individual_rsets(limit=50): diff -r 92e4c07f86c0 -r 5062d86d6ffe test/unittest_rqlrewrite.py --- a/test/unittest_rqlrewrite.py Wed Jan 05 15:32:22 2011 +0100 +++ b/test/unittest_rqlrewrite.py Wed Jan 05 15:32:56 2011 +0100 @@ -27,7 +27,7 @@ from cubicweb.devtools import repotest, TestServerConfiguration -def setup_module(*args): +def setUpModule(*args): global rqlhelper, schema config = TestServerConfiguration(RQLRewriteTC.datapath('rewrite')) config.bootstrap_cubes() @@ -39,7 +39,7 @@ 'has_text': 'fti'}) repotest.do_monkey_patch() -def teardown_module(*args): +def tearDownModule(*args): repotest.undo_monkey_patch() global rqlhelper, schema del rqlhelper, schema diff -r 92e4c07f86c0 -r 5062d86d6ffe web/test/unittest_formfields.py --- a/web/test/unittest_formfields.py Wed Jan 05 15:32:22 2011 +0100 +++ b/web/test/unittest_formfields.py Wed Jan 05 15:32:56 2011 +0100 @@ -29,7 +29,7 @@ from cubes.file.entities import File -def setup_module(*args): +def setUpModule(*args): global schema config = TestServerConfiguration('data', apphome=GuessFieldTC.datadir) config.bootstrap_cubes() diff -r 92e4c07f86c0 -r 5062d86d6ffe web/test/unittest_formwidgets.py --- a/web/test/unittest_formwidgets.py Wed Jan 05 15:32:22 2011 +0100 +++ b/web/test/unittest_formwidgets.py Wed Jan 05 15:32:56 2011 +0100 @@ -24,7 +24,7 @@ from cubes.file.entities import File -def setup_module(*args): +def setUpModule(*args): global schema config = TestServerConfiguration('data', apphome=WidgetsTC.datadir) config.bootstrap_cubes()