5 new revisions:
Revision: 09b4d9c80d0f
Branch: default
Author: Anssi Syrjäsalo
Date: Fri May 24 04:59:18 2013
Log: Added Continue For Loop keyword logging....
http://code.google.com/p/robotframework/source/detail?r=09b4d9c80d0f
Revision: e9e5a5a41cb1
Branch: default
Author: Anssi Syrjäsalo
Date: Fri May 24 05:01:19 2013
Log: Added Exit For Loop keyword logging....
http://code.google.com/p/robotframework/source/detail?r=e9e5a5a41cb1
Revision: 33e8e543e021
Branch: default
Author: Anssi Syrjäsalo
Date: Fri May 24 05:13:10 2013
Log: Return From Keyword to log with level INFO when used...
http://code.google.com/p/robotframework/source/detail?r=33e8e543e021
Revision: cde4b7983056
Branch: default
Author: Anssi Syrjäsalo
Date: Fri May 24 05:15:05 2013
Log: merge
http://code.google.com/p/robotframework/source/detail?r=cde4b7983056
Revision: 48ea11961e55
Branch: default
Author: Anssi Syrjäsalo
Date: Fri May 24 05:15:17 2013
Log: Automated merge with https://code.google.com/p/robotframework/
http://code.google.com/p/robotframework/source/detail?r=48ea11961e55
==============================================================================
Revision: 09b4d9c80d0f
Branch: default
Author: Anssi Syrjäsalo
Date: Fri May 24 04:59:18 2013
Log: Added Continue For Loop keyword logging.
Update issue 1125
Added Continue For Loop keyword logging.
http://code.google.com/p/robotframework/source/detail?r=09b4d9c80d0f
Modified:
/atest/robot/running/continue_for_loop.txt
/src/robot/libraries/BuiltIn.py
=======================================
--- /atest/robot/running/continue_for_loop.txt Tue May 21 03:34:12 2013
+++ /atest/robot/running/continue_for_loop.txt Fri May 24 04:59:18 2013
@@ -26,10 +26,10 @@
Continue For Loop In User Keyword Without For Loop Should Fail
Check Test Case ${TESTNAME}
-Continue For Loop Keyword Should Have No Messages
+Continue For Loop Keyword Should Log Info
${tc} = Check Test Case Simple Continue For Loop
Should Be Equal ${tc.kws[0].kws[0].kws[0].name} BuiltIn.Continue
For Loop
- Should Be Empty ${tc.kws[0].kws[0].kws[0].msgs}
+ Should Be Equal As Strings ${tc.kws[0].kws[0].kws[0].msgs[0]}
Continuing for loop from the next iteration INFO
Continue For Loop In Test Teardown
Test And All Keywords Should Have Passed
=======================================
--- /src/robot/libraries/BuiltIn.py Thu May 23 02:10:25 2013
+++ /src/robot/libraries/BuiltIn.py Fri May 24 04:59:18 2013
@@ -1612,6 +1612,7 @@
New in Robot Framework 2.8.
"""
+ self.log("Continuing for loop from the next iteration")
raise ContinueForLoop()
def continue_for_loop_if(self, condition):
==============================================================================
Revision: e9e5a5a41cb1
Branch: default
Author: Anssi Syrjäsalo
Date: Fri May 24 05:01:19 2013
Log: Added Exit For Loop keyword logging.
Update issue 1411
Added Exit For Loop keyword logging.
http://code.google.com/p/robotframework/source/detail?r=e9e5a5a41cb1
Modified:
/atest/robot/running/exit_for_loop.txt
/src/robot/libraries/BuiltIn.py
=======================================
--- /atest/robot/running/exit_for_loop.txt Wed May 22 06:09:24 2013
+++ /atest/robot/running/exit_for_loop.txt Fri May 24 05:01:19 2013
@@ -29,10 +29,10 @@
Exit For Loop In User Keyword Without For Loop Should Fail
Check Test Case ${TESTNAME}
-Exit For Loop Keyword Should Have No Messages
+Exit For Loop Keyword Should Log Info
${tc} = Check Test Case Simple Exit For Loop
Should Be Equal ${tc.kws[0].kws[0].kws[0].name} BuiltIn.Exit For
Loop
- Should Be Empty ${tc.kws[0].kws[0].kws[0].msgs}
+ Should Be Equal As Strings ${tc.kws[0].kws[0].kws[0].msgs[0]}
Exiting for loop INFO
Custom Exception with ROBOT_EXIT_FOR_LOOP Works But Is Deprecated
Check Log Message ${ERRORS[0]} Using ROBOT_EXIT_FOR_LOOP is
deprecated in 2.8. WARN
=======================================
--- /src/robot/libraries/BuiltIn.py Fri May 24 04:59:18 2013
+++ /src/robot/libraries/BuiltIn.py Fri May 24 05:01:19 2013
@@ -1648,6 +1648,7 @@
New in Robot Framework 2.5.2.
"""
+ self.log("Exiting for loop")
raise ExitForLoop()
def exit_for_loop_if(self, condition):
==============================================================================
Revision: 33e8e543e021
Branch: default
Author: Anssi Syrjäsalo
Date: Fri May 24 05:13:10 2013
Log: Return From Keyword to log with level INFO when used
Update issue 1442
Status: review
Implementation and tests done after this commit.
http://code.google.com/p/robotframework/source/detail?r=33e8e543e021
Modified:
/atest/robot/running/return_from_keyword.txt
/src/robot/libraries/BuiltIn.py
=======================================
--- /atest/robot/running/return_from_keyword.txt Wed May 15 03:12:29 2013
+++ /atest/robot/running/return_from_keyword.txt Fri May 24 05:13:10 2013
@@ -54,3 +54,23 @@
Return From Keyword If does not evaluate bogus arguments if condition is
untrue
Check Test Case ${TESTNAME}
+
+Logs Info Without Return Values
+ ${tc} = Check Test Case Without Return Value
+ Should Be Equal As Strings ${tc.kws[0].kws[0].msgs[0]} Returning
from keyword
+
+Logs Info With Single Return Value
+ ${tc} = Check Test Case With Single Return Value
+ Should Be Equal As Strings ${tc.kws[0].kws[0].msgs[0]} Returning
from keyword with: something to return
+
+Logs Info With Multiple Return Values
+ ${tc} = Check Test Case With Multiple Return Values
+ Should Be Equal As Strings ${tc.kws[0].kws[0].msgs[0]} Returning
from keyword with: something, to, return
+
+Logs Info With Variable
+ ${tc} = Check Test Case With Variable
+ Should Be Equal As Strings ${tc.kws[0].kws[0].msgs[0]} Returning
from keyword with: \${arg}
+
+Logs Info With List Variable
+ ${tc} = Check Test Case With List Variable
+ Should Be Equal As Strings ${tc.kws[0].kws[0].msgs[0]} Returning
from keyword with: 0, \@{list}
=======================================
--- /src/robot/libraries/BuiltIn.py Thu May 23 02:10:25 2013
+++ /src/robot/libraries/BuiltIn.py Fri May 24 05:13:10 2013
@@ -1711,6 +1711,11 @@
accomplished directly with `Return From Keyword If`. Both of these
keywords are new in Robot Framework 2.8.
"""
+ log_message = 'Returning from keyword'
+ if return_values:
+ log_values = ', '.join(value for value in return_values)
+ log_message = '%s with: %s' % (log_message, log_values)
+ self.log(log_message)
raise ReturnFromKeyword(return_values)
@run_keyword_variant(resolve=1)
==============================================================================
Revision: cde4b7983056
Branch: default
Author: Anssi Syrjäsalo
Date: Fri May 24 05:15:05 2013
Log: merge
http://code.google.com/p/robotframework/source/detail?r=cde4b7983056
Modified:
/src/robot/libraries/BuiltIn.py
=======================================
--- /src/robot/libraries/BuiltIn.py Fri May 24 05:13:10 2013
+++ /src/robot/libraries/BuiltIn.py Fri May 24 05:15:05 2013
@@ -1612,6 +1612,7 @@
New in Robot Framework 2.8.
"""
+ self.log("Continuing for loop from the next iteration")
raise ContinueForLoop()
def continue_for_loop_if(self, condition):
@@ -1647,6 +1648,7 @@
New in Robot Framework 2.5.2.
"""
+ self.log("Exiting for loop")
raise ExitForLoop()
def exit_for_loop_if(self, condition):
==============================================================================
Revision: 48ea11961e55
Branch: default
Author: Anssi Syrjäsalo
Date: Fri May 24 05:15:17 2013
Log: Automated merge with https://code.google.com/p/robotframework/
http://code.google.com/p/robotframework/source/detail?r=48ea11961e55
Modified:
/atest/robot/running/exit_for_loop.txt
/src/robot/libraries/BuiltIn.py
=======================================
--- /atest/robot/running/exit_for_loop.txt Fri May 24 03:05:28 2013
+++ /atest/robot/running/exit_for_loop.txt Fri May 24 05:15:17 2013
@@ -29,10 +29,10 @@
Exit For Loop In User Keyword Without For Loop Should Fail
Check Test Case ${TESTNAME}
-Exit For Loop Keyword Should Have No Messages
+Exit For Loop Keyword Should Log Info
${tc} = Check Test Case Simple Exit For Loop
Should Be Equal ${tc.kws[0].kws[0].kws[0].name} BuiltIn.Exit For
Loop
- Should Be Empty ${tc.kws[0].kws[0].kws[0].msgs}
+ Should Be Equal As Strings ${tc.kws[0].kws[0].kws[0].msgs[0]}
Exiting for loop INFO
Custom Exception with ROBOT_EXIT_FOR_LOOP Works But Is Deprecated
${msg} = Catenate
=======================================
--- /src/robot/libraries/BuiltIn.py Fri May 24 02:41:12 2013
+++ /src/robot/libraries/BuiltIn.py Fri May 24 05:15:17 2013
@@ -1615,6 +1615,7 @@
New in Robot Framework 2.8.
"""
+ self.log("Continuing for loop from the next iteration")
raise ContinueForLoop()
def continue_for_loop_if(self, condition):
@@ -1650,6 +1651,7 @@
New in Robot Framework 2.5.2.
"""
+ self.log("Exiting for loop")
raise ExitForLoop()
def exit_for_loop_if(self, condition):
@@ -1714,6 +1716,11 @@
accomplished directly with `Return From Keyword If`. Both of these
keywords are new in Robot Framework 2.8.
"""
+ log_message = 'Returning from keyword'
+ if return_values:
+ log_values = ', '.join(value for value in return_values)
+ log_message = '%s with: %s' % (log_message, log_values)
+ self.log(log_message)
raise ReturnFromKeyword(return_values)
@run_keyword_variant(resolve=1)
--
---
You received this message because you are subscribed to the Google Groups "robotframework-commit" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
