2 new revisions:
Revision: 1e410adc21cc
Branch: default
Author: Jussi Malinen <[email protected]>
Date: Tue May 14 05:48:48 2013
Log: document that ~username expansion does not work on windows python
2.5 ...
http://code.google.com/p/robotframework/source/detail?r=1e410adc21cc
Revision: 33d0671a57d1
Branch: default
Author: Jussi Malinen <[email protected]>
Date: Tue May 14 05:49:00 2013
Log: Automated merge with https://code.google.com/p/robotframework/
http://code.google.com/p/robotframework/source/detail?r=33d0671a57d1
==============================================================================
Revision: 1e410adc21cc
Branch: default
Author: Jussi Malinen <[email protected]>
Date: Tue May 14 05:48:48 2013
Log: document that ~username expansion does not work on windows python
2.5 and make the acceptance test non critical on python 2.5
http://code.google.com/p/robotframework/source/detail?r=1e410adc21cc
Modified:
/atest/resources/atest_resource.txt
/atest/resources/read_interpreter.py
/atest/robot/standard_libraries/operating_system/path_expansion.txt
/src/robot/libraries/OperatingSystem.py
=======================================
--- /atest/resources/atest_resource.txt Mon May 13 08:23:56 2013
+++ /atest/resources/atest_resource.txt Tue May 14 05:48:48 2013
@@ -326,3 +326,9 @@
${interpreter} = Get interpreter ${OUTFILE}
${is 27} = is 27 ${interpreter}
Run keyword unless ${is 27} ${kw} @{args}
+
+Run on python 2.5
+ [arguments] ${kw} @{args}
+ ${interpreter} = Get interpreter ${OUTFILE}
+ ${is 25} = is 25 ${interpreter}
+ Run keyword if ${is 25} ${kw} @{args}
=======================================
--- /atest/resources/read_interpreter.py Mon May 13 08:23:56 2013
+++ /atest/resources/read_interpreter.py Tue May 14 05:48:48 2013
@@ -16,6 +16,9 @@
def is_27(interpreter):
return interpreter.version.startswith('2.7')
+def is_25(interpreter):
+ return interpreter.version.startswith('2.5')
+
def is_jython(interpreter):
return interpreter.interpreter.lower() == 'jython'
=======================================
--- /atest/robot/standard_libraries/operating_system/path_expansion.txt Wed
Apr 24 06:29:20 2013
+++ /atest/robot/standard_libraries/operating_system/path_expansion.txt Tue
May 14 05:48:48 2013
@@ -10,4 +10,5 @@
Tilde and username in path
[Tags] pybot
+ Run on python 2.5 Remove tags regression
Check testcase ${TESTNAME}
=======================================
--- /src/robot/libraries/OperatingSystem.py Wed May 8 02:31:44 2013
+++ /src/robot/libraries/OperatingSystem.py Tue May 14 05:48:48 2013
@@ -95,8 +95,8 @@
operating system dependent, but typically e.g. `~/robot` is expanded to
`C:\\Users\\<user>\\robot` on Windows and `/home/<user>/robot` on
Linuxes.
- Notice that the `~username` form does not work on Jython. Tilde
expansion
- is a new feature in Robot Framework 2.8.
+ Notice that the `~username` form does not work on Jython or on Windows
+ python 2.5. Tilde expansion is a new feature in Robot Framework 2.8.
= Example =
==============================================================================
Revision: 33d0671a57d1
Branch: default
Author: Jussi Malinen <[email protected]>
Date: Tue May 14 05:49:00 2013
Log: Automated merge with https://code.google.com/p/robotframework/
http://code.google.com/p/robotframework/source/detail?r=33d0671a57d1
--
---
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.
