MailManager/tests/classes TestMailManager.py,1.11,1.12

[Kevin C. <ke...@us...>]

Update of /cvsroot/mailmanager/MailManager/tests/classes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19539/tests/classes

Modified Files:
	TestMailManager.py 
Log Message:
Tidies up testMailManager
testsuite.conf now includes some previously missing variables


Index: TestMailManager.py
===================================================================
RCS file: /cvsroot/mailmanager/MailManager/tests/classes/TestMailManager.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- TestMailManager.py	3 Feb 2006 16:45:40 -0000	1.11
+++ TestMailManager.py	27 Feb 2006 17:22:11 -0000	1.12
@@ -66,12 +66,12 @@
     meta_type = 'TestMailManager'
     dbcachedir = None
     debug = False
-
+    
     def logFlowPointEntry(self, flowchart, section):
         zLOG.LOG('MailManager:', zLOG.DEBUG,
                  '%sflowpoint: + Entered %s %s' % (self.getLogName(), flowchart, section))
-        #if self.debug:
-        #    print '%sflowpoint: + Entered %s %s' % (self.getLogName(), flowchart, section)
+        if self.debug:
+            print '%sflowpoint: + Entered %s %s' % (self.getLogName(), flowchart, section)
         if getattr(self, '_v_flowpoint', None) is None:
             self._v_flowpoint = {}
         self._v_flowpoint[flowchart] = (section, False)
@@ -81,8 +81,8 @@
     def logFlowPointExit(self, flowchart, section):
         zLOG.LOG('MailManager:', zLOG.DEBUG,
                  '%sflowpoint: + Exited %s %s' % (self.getLogName(), flowchart, section))
-        #if self.debug:
-        #    print '%sflowpoint: + Exited %s %s' % (self.getLogName(), flowchart, section)
+        if self.debug:
+            print '%sflowpoint: + Exited %s %s' % (self.getLogName(), flowchart, section)
         if getattr(self, '_v_flowpoint', None) is None:
             self._v_flowpoint = {}
         self._v_flowpoint[flowchart] = (section, True)
@@ -103,10 +103,11 @@
             
         if self.dbplatform == 'postgres':
 
-            environ = os.environ.copy()
-            environ['PGPASSWORD'] = self.config['database_postgres']['adminpass']
-            environ['PGUSER'] = self.config['database_postgres']['adminuser']
-            environ['PGHOST'] = self.config['database_postgres']['host']
+            environ = {
+                'PGPASSWORD' : self.config['database_postgres']['adminpass'],
+                'PGUSER' : self.config['database_postgres']['adminuser'],
+                'PGHOST' : self.config['database_postgres']['host']
+            }
 
             args = [self.config['paths']['pg_dump'],
                     '-F', 'p',
@@ -186,4 +187,4 @@
 
     def cleanupDBState(self):
         if self.dbcachedir is not None:
-            os.system('rm -r %s' % self.dbcachedir)
+            os.system('rm -rf %s' % self.dbcachedir)