4 new revisions:
Revision: 6c320ec4f139
Branch: default
Author: Pekka Klärck
Date: Mon Sep 17 06:26:28 2012
Log: Collections tests: made tests independent on obscure sorting
order det...
http://code.google.com/p/robotframework/source/detail?r=6c320ec4f139
Revision: bb73beb89fc4
Branch: default
Author: Pekka Klärck
Date: Mon Sep 17 07:06:43 2012
Log: still failed to make all remove keyword tests pass after changing
how ...
http://code.google.com/p/robotframework/source/detail?r=bb73beb89fc4
Revision: 38535ba494c8
Branch: default
Author: Pekka Klärck
Date: Mon Sep 17 07:27:56 2012
Log: tidy: workaround for sys.stdout.isatty() always returning false
with i...
http://code.google.com/p/robotframework/source/detail?r=38535ba494c8
Revision: f09b4ead7bb1
Branch: default
Author: Pekka Klärck
Date: Mon Sep 17 07:41:53 2012
Log: fixed non-ASCII command line arguments with ipy
http://code.google.com/p/robotframework/source/detail?r=f09b4ead7bb1
==============================================================================
Revision: 6c320ec4f139
Branch: default
Author: Pekka Klärck
Date: Mon Sep 17 06:26:28 2012
Log: Collections tests: made tests independent on obscure sorting
order details
http://code.google.com/p/robotframework/source/detail?r=6c320ec4f139
Modified:
/atest/robot/standard_libraries/collections/dictionary.txt
/atest/testdata/standard_libraries/collections/dictionary.txt
=======================================
--- /atest/robot/standard_libraries/collections/dictionary.txt Sun Jul 17
14:03:45 2011
+++ /atest/robot/standard_libraries/collections/dictionary.txt Mon Sep 17
06:26:28 2012
@@ -119,14 +119,14 @@
${tc} = Check Test Case ${TEST NAME}
${expected} = Set Variable Dictionary size is 3 and it contains
following items:\n 3: None\n a: 1\n b: 2
Check Log Message ${tc.kws[0].msgs[0]} ${expected} INFO
- Variable Should Not Exist ${tc.kws[1].msgs[0]}
+ Should Be Empty ${tc.kws[1].msgs}
Check Log Message ${tc.kws[2].msgs[0]} ${expected} WARN
Check Log Message ${tc.kws[3].msgs[0]} ${expected} DEBUG
Check Log Message ${tc.kws[4].msgs[0]} ${expected} INFO
Log Dictionary With Different Dictionaries
${tc} = Check Test Case ${TEST NAME}
- Check Log Message ${tc.kws[0].msgs[0]} Dictionary is empty INFO
- Check Log Message ${tc.kws[1].msgs[0]} Dictionary has one item:\n a:
1 INFO
- Check Log Message ${tc.kws[4].msgs[0]} Dictionary size is 2 and it
contains following items:\n (1, 2, 3): 3.12\n 1: 2 INFO
+ Check Log Message ${tc.kws[0].msgs[0]} Dictionary is empty
+ Check Log Message ${tc.kws[1].msgs[0]} Dictionary has one item:\n a:
1
+ Check Log Message ${tc.kws[3].msgs[0]} Dictionary size is 3 and it
contains following items:\nTrue: xxx\nfoo: []\n(1, 2, 3): 3.14
=======================================
--- /atest/testdata/standard_libraries/collections/dictionary.txt Thu Aug
30 15:09:14 2012
+++ /atest/testdata/standard_libraries/collections/dictionary.txt Mon Sep
17 06:26:28 2012
@@ -187,8 +187,7 @@
Log Dictionary With Different Dictionaries
Log Dictionary ${D0}
Log Dictionary ${D1}
- ${tuple} = Evaluate (1, 2, 3)
- ${dict} = Create Dictionary ${tuple} ${3.12} 1 2
+ ${dict} = Evaluate {(1, 2, 3): 3.14, True: 'xxx', 'foo': []}
Log Dictionary ${dict}
*** Keywords ***
==============================================================================
Revision: bb73beb89fc4
Branch: default
Author: Pekka Klärck
Date: Mon Sep 17 07:06:43 2012
Log: still failed to make all remove keyword tests pass after changing
how for loops are handled.....
http://code.google.com/p/robotframework/source/detail?r=bb73beb89fc4
Modified:
/atest/robot/cli/runner/remove_keywords.txt
=======================================
--- /atest/robot/cli/runner/remove_keywords.txt Wed Sep 12 16:05:24 2012
+++ /atest/robot/cli/runner/remove_keywords.txt Mon Sep 17 07:06:43 2012
@@ -6,7 +6,8 @@
*** Variables ***
${PASS MESSAGE} -PASSED -ALL
${FAIL MESSAGE} -ALL +PASSED
-${FOR MESSAGE} -FOR -ALL
+${REMOVED FOR MESSAGE} -FOR -ALL
+${KEPT FOR MESSAGE} +FOR -ALL
${REMOVED WUKS MESSAGE} -WUKS -ALL
${KEPT WUKS MESSAGE} +WUKS -ALL
@@ -21,7 +22,8 @@
Output should contain fail message
FOR option
- Log should not contain ${FOR MESSAGE}
+ Log should not contain ${REMOVED FOR MESSAGE}
+ Log should contain ${KEPT FOR MESSAGE}
Output should contain for messages
WUKS option
@@ -65,9 +67,11 @@
Test should contain for messages
[Arguments] ${name}
${tc} = Check test case ${name}
- Check log message ${tc.kws[0].kws[0].kws[0].msgs[0]} ${FOR
MESSAGE} one
- Check log message ${tc.kws[0].kws[1].kws[0].msgs[0]} ${FOR
MESSAGE} two
- Check log message ${tc.kws[0].kws[2].kws[0].msgs[0]} ${FOR
MESSAGE} three
+ ${for} = Set Variable ${tc.kws[0].kws[0]}
+ Check log message ${for.kws[0].kws[0].kws[0].msgs[0]} ${REMOVED
FOR MESSAGE} one
+ Check log message ${for.kws[1].kws[0].kws[0].msgs[0]} ${REMOVED
FOR MESSAGE} two
+ Check log message ${for.kws[2].kws[0].kws[0].msgs[0]} ${REMOVED
FOR MESSAGE} three
+ Check log message ${for.kws[3].kws[0].kws[0].msgs[0]} ${KEPT FOR
MESSAGE} LAST
Output should contain WUKS messages
Test should contain WUKS messages WUKS when test passes
==============================================================================
Revision: 38535ba494c8
Branch: default
Author: Pekka Klärck
Date: Mon Sep 17 07:27:56 2012
Log: tidy: workaround for sys.stdout.isatty() always returning false
with ipy
http://code.google.com/p/robotframework/source/detail?r=38535ba494c8
Modified:
/src/robot/tidy.py
/src/robot/utils/application.py
=======================================
--- /src/robot/tidy.py Thu Jun 14 07:32:11 2012
+++ /src/robot/tidy.py Mon Sep 17 07:27:56 2012
@@ -169,7 +169,7 @@
self._print(tidy.file(inputs[0]))
def _print(self, msg):
- if sys.stdout.isatty():
+ if self._isatty(sys.stdout):
msg = encode_output(msg)
else:
if os.sep == '\\' and 'b' not in sys.stdout.mode:
=======================================
--- /src/robot/utils/application.py Wed Sep 12 16:05:24 2012
+++ /src/robot/utils/application.py Mon Sep 17 07:27:56 2012
@@ -101,6 +101,12 @@
self._exit(rc)
return rc
+ def _isatty(self, stream):
+ # http://ironpython.codeplex.com/workitem/33123
+ if sys.platform == 'cli':
+ return False
+ return hasattr(stream, 'isatty') and stream.isatty()
+
def _exit(self, rc):
sys.exit(rc)
==============================================================================
Revision: f09b4ead7bb1
Branch: default
Author: Pekka Klärck
Date: Mon Sep 17 07:41:53 2012
Log: fixed non-ASCII command line arguments with ipy
http://code.google.com/p/robotframework/source/detail?r=f09b4ead7bb1
Modified:
/atest/robot/cli/monitor/non_ascii.txt
/src/robot/utils/encoding.py
=======================================
--- /atest/robot/cli/monitor/non_ascii.txt Fri Mar 18 07:08:08 2011
+++ /atest/robot/cli/monitor/non_ascii.txt Mon Sep 17 07:41:53 2012
@@ -8,14 +8,14 @@
Non-ascii characters in suite name and documentation
Check stdout contains regexp
- ... Hyvää Üötä [€?]åppa :: Testing that reading and writing of
Unicode \\(äöå [§?]½[€?] et\\.\\.\\.
+ ... Hyvää Üötä [€?]åppa :: Testing that reading and writing of
Unicode \\(äöå .½[€?] et\\.\\.\\.
Non-ascii characters in test name and documentation
Check stdout contains regexp
- ... UTF-8 Name Äöå [§?]½[€?]" :: Quote is actually plain ASCII but
there was... | FAIL |
+ ... UTF-8 Name Äöå .½[€?]" :: Quote is actually plain ASCII but there
was... | FAIL |
Check stdout contains regexp
- ... UTF-8 :: äöå [§?]½[€?]
+ ... UTF-8 :: äöå .½[€?]
Non-ascii error message
Check stdout contains regexp
- ... Virheessäkin on ääkkösiä: Äöå [§?]½[€?]"
+ ... Virheessäkin on ääkkösiä: Äöå .½[€?]"
=======================================
--- /src/robot/utils/encoding.py Thu Mar 8 04:14:02 2012
+++ /src/robot/utils/encoding.py Mon Sep 17 07:41:53 2012
@@ -37,6 +37,8 @@
def decode_from_system(string, can_be_from_java=True):
"""Decodes bytes from system (e.g. cli args or env vars) to Unicode."""
+ if sys.platform == 'cli':
+ return string
if sys.platform.startswith('java') and can_be_from_java:
# http://bugs.jython.org/issue1592
from java.lang import String
