3 new revisions:
Revision: ed5387b52941
Author: Mikko Korpela <[email protected]>
Date: Mon Nov 7 04:26:53 2011
Log: Fix embedded args namespace
http://code.google.com/p/robotframework/source/detail?r=ed5387b52941
Revision: 4aa24a8bc357
Author: Mikko Korpela <[email protected]>
Date: Mon Nov 7 04:27:39 2011
Log: test for embedded args namespace
http://code.google.com/p/robotframework/source/detail?r=4aa24a8bc357
Revision: f227b91e552f
Author: Mikko Korpela <[email protected]>
Date: Mon Nov 7 04:28:20 2011
Log: merge
http://code.google.com/p/robotframework/source/detail?r=f227b91e552f
==============================================================================
Revision: ed5387b52941
Author: Mikko Korpela <[email protected]>
Date: Mon Nov 7 04:26:53 2011
Log: Fix embedded args namespace
http://code.google.com/p/robotframework/source/detail?r=ed5387b52941
Modified:
/src/robot/running/userkeyword.py
=======================================
--- /src/robot/running/userkeyword.py Fri Aug 26 06:49:21 2011
+++ /src/robot/running/userkeyword.py Mon Nov 7 04:26:53 2011
@@ -281,12 +281,12 @@
self.origname = template.name
self._copy_attrs_from_template(template)
- def run(self, context, args):
+ def _run(self, context, args):
if not context.dry_run:
for name, value in self.embedded_args:
context.get_current_vars()[name] = \
context.get_current_vars().replace_scalar(value)
- return UserKeywordHandler.run(self, context, args)
+ return UserKeywordHandler._run(self, context, args)
def _copy_attrs_from_template(self, template):
self.libname = template.libname
==============================================================================
Revision: 4aa24a8bc357
Author: Mikko Korpela <[email protected]>
Date: Mon Nov 7 04:27:39 2011
Log: test for embedded args namespace
http://code.google.com/p/robotframework/source/detail?r=4aa24a8bc357
Added:
/atest/robot/running/embedded_args_namespace.txt
=======================================
--- /dev/null
+++ /atest/robot/running/embedded_args_namespace.txt Mon Nov 7 04:27:39
2011
@@ -0,0 +1,12 @@
+*** Settings ***
+Force Tags regression pybot jybot
+
+*** Test Cases ***
+Test
+ ${var}= Set Variable hello
+ My embedded warrior
+ Should be equal ${var} hello
+
+*** Keywords ***
+My embedded ${var}
+ Should be equal ${var} warrior
==============================================================================
Revision: f227b91e552f
Author: Mikko Korpela <[email protected]>
Date: Mon Nov 7 04:28:20 2011
Log: merge
http://code.google.com/p/robotframework/source/detail?r=f227b91e552f
