2 new revisions:
Revision: c8fec1917294
Author: Pekka Klärck
Date: Tue Dec 13 14:47:09 2011
Log: ooops
http://code.google.com/p/robotframework/source/detail?r=c8fec1917294
Revision: 0a4c00cefd2d
Author: Pekka Klärck
Date: Tue Dec 13 15:10:56 2011
Log: 1) Cleaned up test for creating parent directory for output files
auto...
http://code.google.com/p/robotframework/source/detail?r=0a4c00cefd2d
==============================================================================
Revision: c8fec1917294
Author: Pekka Klärck
Date: Tue Dec 13 14:47:09 2011
Log: ooops
http://code.google.com/p/robotframework/source/detail?r=c8fec1917294
Modified:
/atest/robot/output/xunit.txt
=======================================
--- /atest/robot/output/xunit.txt Tue Dec 13 14:09:27 2011
+++ /atest/robot/output/xunit.txt Tue Dec 13 14:47:09 2011
@@ -14,7 +14,7 @@
Check Stdout Does Not Contain XUnit
XUnit Option Given
- Run Tests -x xunit.xml -l log.html ${TESTDATA}
+ Run Tests -x xunit.xml -l log.html ${TESTDATA}
Check Stdout Contains XUnit
Stderr should be empty
File Should Exist ${OUTDIR}/xunit.xml
==============================================================================
Revision: 0a4c00cefd2d
Author: Pekka Klärck
Date: Tue Dec 13 15:10:56 2011
Log: 1) Cleaned up test for creating parent directory for output files
automatically. This test has likely messed up CI. 2) Also cleaned up
handling the error itself.
http://code.google.com/p/robotframework/source/detail?r=0a4c00cefd2d
Modified:
/atest/robot/cli/rebot/invalid_usage.txt
/src/robot/conf/settings.py
=======================================
--- /atest/robot/cli/rebot/invalid_usage.txt Tue Dec 13 14:37:27 2011
+++ /atest/robot/cli/rebot/invalid_usage.txt Tue Dec 13 15:10:56 2011
@@ -24,14 +24,11 @@
Rebot should fail ${MYOUTDIR}${/}invalid.xml Reading XML
source '.*invalid.xml' failed: Incompatible XML element 'not'
Invalid Output Directory
- [Documentation] Test error handling when some of the output dirs
(where to write output, report, etc.) is invalid (i.e. can't be created).
To make sure creating dirs fails their names are non-standard (that's not
enough in Linux) parent is made read only.
- Create Directory ${MYOUTDIR}${/}x
- Set Read Only ${MYOUTDIR}${/}x
- Rebot should fail -d ${MYOUTDIR}${/}x${/}:i ${MYINPUT}
- ... Can't create log file's parent directory '.*': (OS|IO|
Windows)Error: .*
- Rebot should fail -d ${MYOUTDIR}${/}x${/}:i -o out.xml -l none -r
none ${MYINPUT}
- ... Can't create output file's parent directory '.*': (OS|IO|
Windows)Error: .*
- [Teardown] Set Read Write ${MYOUTDIR}${/}x
+ Create File ${MYOUTDIR}${/}not-dir
+ Rebot should fail -d ${MYOUTDIR}${/}not-dir${/}dir ${MYINPUT}
+ ... Creating log file directory '.*' failed: .*
+ Rebot should fail -d ${MYOUTDIR}${/}not-dir${/}dir -o out.xml -l none
-r none ${MYINPUT}
+ ... Creating output file directory '.*' failed: .*
Invalid Argument Values
Run Rebot --suitestatlevel not_int --tagstatlink less_than_3x_:
${MYINPUT}
=======================================
--- /src/robot/conf/settings.py Thu Dec 1 06:29:09 2011
+++ /src/robot/conf/settings.py Tue Dec 13 15:10:56 2011
@@ -165,9 +165,9 @@
try:
if not os.path.exists(path):
os.makedirs(path)
- except:
- raise DataError("Can't create %s file's parent
directory '%s': %s"
- % (type_.lower(), path,
utils.get_error_message()))
+ except EnvironmentError, err:
+ raise DataError("Creating %s file directory '%s' failed: %s"
+ % (type_.lower(), path, err.strerror))
def _process_metadata_or_tagdoc(self, value):
value = value.replace('_', ' ')
