[Zope-CVS] CVS: Packages/FunctionalTests/FunctionalTests -
Framework.py:1.3.4.2
Karl Anderson
cvs-admin at zope.org
Thu Nov 13 16:07:40 EST 2003
Update of /cvs-repository/Packages/FunctionalTests/FunctionalTests
In directory cvs.zope.org:/tmp/cvs-serv32103
Modified Files:
Tag: kra-intersest-branch
Framework.py
Log Message:
buildTest(): Update ConfigFile defaults with given defaults, to allow defaults
to be passed between scenarios.
Don't pass defaults to scenario child of suite, Result will
supply them.
Suite._execute(): get defaults from previous Result.
=== Packages/FunctionalTests/FunctionalTests/Framework.py 1.3.4.1 => 1.3.4.2 ===
--- Packages/FunctionalTests/FunctionalTests/Framework.py:1.3.4.1 Thu Nov 13 13:12:29 2003
+++ Packages/FunctionalTests/FunctionalTests/Framework.py Thu Nov 13 16:07:39 2003
@@ -240,8 +240,8 @@
"""
Load and execute each child scenario/suite file.
"""
- for file, defaults in self.listChildren():
- child = buildTest( file, defaults )
+ for file in self.listChildren():
+ child = buildTest( file, result._defaults ) #XXX again _defaults
childResult = result.newChild( child )
result = child( childResult )
@@ -279,7 +279,8 @@
cp = ConfigParserExt.ConfigParserExt( _SPECIAL_SECTIONS )
apply( cp.setDefaults, (), defaults )
cp.read( filename )
-
+ defaults.update(cp.defaults())
+
test = None
isScenario = 0
@@ -310,7 +311,7 @@
if isScenario:
test.addRequest( buildRequest( cp, section ), repeat_count )
else:
- child = ( cp.get( section, 'file' ), defaults )
+ child = cp.get( section, 'file' )
test.addChild( child, repeat_count )
if isScenario and _POSTCONDITION_SECTION in cp.listSpecialSections( 0 ):
More information about the Zope-CVS
mailing list