[robotframework] r2829 committed - need output encoding avare helper now that outputs can contain non-utf...

[robotframework]

Revision: 2829
Author: pekka.klarck
Date: Wed Mar 31 09:41:04 2010
Log: need output encoding avare helper now that outputs can contain  
non-utf8 chars
http://code.google.com/p/robotframework/source/detail?r=2829
Modified:
 /trunk/atest/resources/resource.txt

=======================================
--- /trunk/atest/resources/resource.txt Wed Mar 31 08:29:10 2010
+++ /trunk/atest/resources/resource.txt Wed Mar 31 09:41:04 2010
@@ -133,28 +133,37 @@
     Should Be Equal  ${item.message.rstrip()}  ${msg}  Wrong log message
     Should Be Equal  ${item.level}  ${level}  Wrong log level
     Should Be Equal  ${item.html}  ${html}  Wrong HTML status
+
+Get Output File
+    [Arguments]  ${path}
+    [Documentation]  Output encoding avare helper
+    ${encoding} =  Evaluate   
__import__('robot').utils.encoding._output_encoding
+    ${encoding} =  Set Variable If  '${path}' in ['${STDERR  
FILE}','${STDOUT FILE}','${SYSLOG FILE}']
+    ...  ${encoding}  UTF-8
+    ${file} =  Log File  ${path}  ${encoding}
+    [Return]  ${file}

 Check File Contains
     [Arguments]  ${path}  @{expected}
     ${exp} =  Catenate  @{expected}
-    ${file} =  Get File  ${path}
+    ${file} =  Get Output File  ${path}
     Should Contain  ${file}  ${exp}

 Check File Does Not Contain
     [Arguments]  ${path}  @{expected}
     ${exp} =  Catenate  @{expected}
-    ${file} =  Get File  ${path}
+    ${file} =  Get Output File  ${path}
     Should Not Contain  ${file}  ${exp}

 Check File Matches Regexp
     [Arguments]  ${path}  @{expected}
     ${exp} =  Catenate  @{expected}
-    ${file} =  Get File  ${path}
+    ${file} =  Get Output File  ${path}
     Should Match Regexp  ${file.strip()}  ^${exp}$

 File Should Be Equal To
     [Arguments]  ${path}  @{expected}
-    ${content} =  Log File  ${path}
+    ${content} =  Get Output File  ${path}
     ${exp} =  Catenate  @{expected}
     Should Be Equal  ${content}  ${exp}

@@ -187,15 +196,15 @@
     Check File Matches Regexp  ${STDOUT_FILE}  @{expected}

 Get Syslog
-    ${file} =  Log File  ${SYSLOG_FILE}
+    ${file} =  Get Output File  ${SYSLOG_FILE}
     [Return]  ${file}

 Get Stderr
-    ${file} =  Log File  ${STDERR_FILE}
+    ${file} =  Get Output File  ${STDERR_FILE}
     [Return]  ${file}

 Get Stdout
-    ${file} =  Log File  ${STDOUT_FILE}
+    ${file} =  Get Output File  ${STDOUT_FILE}
     [Return]  ${file}

 Check Syslog Contains


--
To unsubscribe, reply using "remove me" as the subject.