From: Kevin C. <ke...@us...> - 2006-02-27 20:49:02
|
Update of /cvsroot/mailmanager/MailManager/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12544/tests Modified Files: Tag: RELENG_2_1 testAPI.py testDatabase.py testRulesetEngine.py testTicket.py Log Message: Fixed up mappings and use of primary_database as per the updated setup. This will be covered in the testsuite docs. Index: testDatabase.py =================================================================== RCS file: /cvsroot/mailmanager/MailManager/tests/testDatabase.py,v retrieving revision 1.17.2.2 retrieving revision 1.17.2.3 diff -u -d -r1.17.2.2 -r1.17.2.3 --- testDatabase.py 23 Jan 2006 23:19:47 -0000 1.17.2.2 +++ testDatabase.py 27 Feb 2006 20:48:57 -0000 1.17.2.3 @@ -1565,23 +1565,13 @@ class TestDatabase(databaseTest): - # def testMySQL(self): - # if 'mysql' in self.config['databases']['supported_databases']: - # self.dbplatform = 'mysql' - # self.sqlmethods = {} - # for sqlmethod in sqlmethods: - # self.sqlmethods[sqlmethod] = ZSQLFileMethod('%s.zsql' % sqlmethod, dbplatform=self.dbplatform) - # self.sqlmethods[sqlmethod].schema = '' - # self.databaseTests() - - def testPostgres(self): - if 'postgres' in self.config['databases']['supported_databases']: - self.dbplatform = 'postgres' - self.sqlmethods = {} - for sqlmethod in sqlmethods: - self.sqlmethods[sqlmethod] = ZSQLFileMethod('%s.zsql' % sqlmethod, dbplatform=self.dbplatform) - self.sqlmethods[sqlmethod].schema = self.config['database_postgres']['schema'] - self.databaseTests() + def testDatabase(self): + self.dbplatform = self.config['databases']['primary_database'] + self.sqlmethods = {} + for sqlmethod in sqlmethods: + self.sqlmethods[sqlmethod] = ZSQLFileMethod('%s.zsql' % sqlmethod, dbplatform=self.dbplatform) + self.sqlmethods[sqlmethod].schema = self.config['database_postgres']['schema'] + self.databaseTests() def test_suite(): Index: testTicket.py =================================================================== RCS file: /cvsroot/mailmanager/MailManager/tests/testTicket.py,v retrieving revision 1.6.2.2 retrieving revision 1.6.2.3 diff -u -d -r1.6.2.2 -r1.6.2.3 --- testTicket.py 23 Jan 2006 23:48:39 -0000 1.6.2.2 +++ testTicket.py 27 Feb 2006 20:48:57 -0000 1.6.2.3 @@ -122,16 +122,10 @@ class TestTicket(ticketTest): def testTicket(self): - if 'postgres' == self.config['databases']['primary_database']: - self.dbplatform = 'postgres' - elif 'mysql' == self.config['databases']['primary_database']: - self.dbplatform = 'mysql' + self.dbplatform = 'postgres' self.setupMailManager(dbplatform = self.dbplatform, debugmode=True) self.mmobj.wipeDataset('acmestatic') - #self.mmobj.wipeDataset('mailtests') - #self.mmobj.populateDataset('rulesettests') self.mmobj.populateAccounts('acmestatic') - #self.mmobj.sql.populateRuleset('rulesettests') self.ticketTests() self.removeMailManager() Index: testRulesetEngine.py =================================================================== RCS file: /cvsroot/mailmanager/MailManager/tests/testRulesetEngine.py,v retrieving revision 1.5.2.1 retrieving revision 1.5.2.2 diff -u -d -r1.5.2.1 -r1.5.2.2 --- testRulesetEngine.py 23 Jan 2006 15:41:05 -0000 1.5.2.1 +++ testRulesetEngine.py 27 Feb 2006 20:48:57 -0000 1.5.2.2 @@ -161,30 +161,14 @@ class TestRuleset(RulesetTest): -# def testMySQL(self): -# return -# if 'mysql' in self.config['databases']['supported_databases']: -# self.dbplatform = 'mysql' -# self.sqlmethods = {} -# for sqlmethod in testDatabase.sqlmethods: -# self.sqlmethods[sqlmethod] = testDatabase.ZSQLFileMethod('%s.zsql' % sqlmethod, dbplatform=self.dbplatform) -# self.sqlmethods[sqlmethod].schema = '' -# self.setupMailManager(dbplatform = self.dbplatform, debugmode=True) -# self.mmobj.wipeDataset('acmestatic') -# self.mmobj.populateDataset('acmestatic') -# # self.mmobj.sql.populateRuleset('acmestatic') -# self.rulesetEngineTests() -# self.removeMailManager() - def testPostgres(self): - if 'postgres' in self.config['databases']['supported_databases']: - self.dbplatform = 'postgres' - self.setupMailManager(dbplatform = self.dbplatform, debugmode=True) - #self.mmobj.wipeDataset('rulesettests') - #self.mmobj.populateDataset('rulesettests') - # self.mmobj.sql.populateRuleset('acmestatic') - #self.rulesetEngineTests() - self.removeMailManager() + self.dbplatform = self.config['databases']['supported_databases']: + self.setupMailManager(dbplatform = self.dbplatform, debugmode=True) + #self.mmobj.wipeDataset('rulesettests') + #self.mmobj.populateDataset('rulesettests') + # self.mmobj.sql.populateRuleset('acmestatic') + #self.rulesetEngineTests() + self.removeMailManager() ########################################################################### Index: testAPI.py =================================================================== RCS file: /cvsroot/mailmanager/MailManager/tests/testAPI.py,v retrieving revision 1.8.2.3 retrieving revision 1.8.2.4 diff -u -d -r1.8.2.3 -r1.8.2.4 --- testAPI.py 27 Feb 2006 14:51:48 -0000 1.8.2.3 +++ testAPI.py 27 Feb 2006 20:48:57 -0000 1.8.2.4 @@ -536,22 +536,11 @@ class TestAPI(apiTest): - def testPostgres(self): - self.dbplatform = 'postgres' - self.runAPITests(self.dbplatform) - def runAPITests(self, dbplatform): - if dbplatform in self.config['databases']['supported_databases']: - self.sqlmethods = {} - for sqlmethod in testDatabase.sqlmethods: - self.sqlmethods[sqlmethod] = testDatabase.ZSQLFileMethod('%s.zsql' % sqlmethod, dbplatform='dbplatform') - self.sqlmethods[sqlmethod].schema = self.config['database_%s' % dbplatform]['schema'] - self.setupMailManager(dbplatform = dbplatform) - #self.populateDataset() - #self.populateTickets() - #self.workflowTests() - self.pythonAPITests() - self.removeMailManager() + dbplatform = self.config['databases']['primary_database'] + self.setupMailManager(dbplatform = dbplatform) + self.pythonAPITests() + self.removeMailManager() ########################################################################### |