2 new revisions:

Revision: 37d0a3d7990a
Author:   Pekka Klärck
Date:     Tue Dec 13 14:37:27 2011
Log:      removed invalid test
http://code.google.com/p/robotframework/source/detail?r=37d0a3d7990a

Revision: 9cc6ab941313
Author:   Pekka Klärck
Date:     Tue Dec 13 14:38:26 2011
Log: XmlLogger: cleaner implementation to catch errors in opening output fi...
http://code.google.com/p/robotframework/source/detail?r=9cc6ab941313

==============================================================================
Revision: 37d0a3d7990a
Author:   Pekka Klärck
Date:     Tue Dec 13 14:37:27 2011
Log:      removed invalid test
http://code.google.com/p/robotframework/source/detail?r=37d0a3d7990a

Modified:
 /atest/robot/cli/rebot/invalid_usage.txt

=======================================
--- /atest/robot/cli/rebot/invalid_usage.txt    Thu Dec  1 04:43:29 2011
+++ /atest/robot/cli/rebot/invalid_usage.txt    Tue Dec 13 14:37:27 2011
@@ -33,11 +33,6 @@
... Can't create output file's parent directory '.*': (OS|IO| Windows)Error: .*
     [Teardown]  Set Read Write  ${MYOUTDIR}${/}x

-Invalid Output File
-    Create Directory  ${MYOUTDIR}${/}diréctöry.ext
-    Rebot should fail  -d ${MYOUTDIR} -o diréctöry.ext ${MYINPUT}
- ... Opening output file '.*diréctöry.ext' for writing failed: (IOError|FileNotFoundException): .*
-
 Invalid Argument Values
Run Rebot --suitestatlevel not_int --tagstatlink less_than_3x_: ${MYINPUT} Verify Correct Errors in Stderr Option '--suitestatlevel' expected integer value but got 'not_int'. Default value used instead.\n

==============================================================================
Revision: 9cc6ab941313
Author:   Pekka Klärck
Date:     Tue Dec 13 14:38:26 2011
Log: XmlLogger: cleaner implementation to catch errors in opening output file
http://code.google.com/p/robotframework/source/detail?r=9cc6ab941313

Modified:
 /atest/robot/cli/rebot/output_files.txt
 /atest/robot/cli/runner/output_files.txt
 /src/robot/output/xmllogger.py

=======================================
--- /atest/robot/cli/rebot/output_files.txt     Tue Dec 13 14:31:37 2011
+++ /atest/robot/cli/rebot/output_files.txt     Tue Dec 13 14:38:26 2011
@@ -40,7 +40,7 @@
${output} = Run ${REBOT} -d ${MYOUTDIR} -o diréctöry.xml -r r.html -l l.html ${MYINPUT}
     Directory Should Contain  ${MYOUTDIR}  diréctöry.xml  l.html  r.html
     ${error}=  Catenate  SEPARATOR=\n
- ... \\[ ERROR \\] Opening output file '.*diréctöry.xml' for writing failed: .*
+    ...  \\[ ERROR \\] Opening output file '.*diréctöry.xml' failed: .*
     ...  Log: .*
     ...  Report: .*
     Should Match Regexp  ${output}  ^${error}$
=======================================
--- /atest/robot/cli/runner/output_files.txt    Wed Dec  7 00:57:15 2011
+++ /atest/robot/cli/runner/output_files.txt    Tue Dec 13 14:38:26 2011
@@ -52,7 +52,7 @@
 Non-writable Output File
     Create Directory  ${CLI OUTDIR}/diréctöry.xml
Run Tests Without Processing Output --output ${CLI OUTDIR}/diréctöry.xml ${TESTFILE} - Check Stderr Matches Regexp \\[ ERROR \\] Opening output file '.*diréctöry.xml' for writing failed: (IOError| FileNotFoundException): .*${USAGE_TIP} + Check Stderr Matches Regexp \\[ ERROR \\] Opening output file '.*diréctöry.xml' failed: .*${USAGE_TIP}

 Non-writable Log and Report
     ${directory} =  Join Path  ${CLI OUTDIR}/diréctöry.html
=======================================
--- /src/robot/output/xmllogger.py      Thu Dec  1 03:28:40 2011
+++ /src/robot/output/xmllogger.py      Tue Dec 13 14:38:26 2011
@@ -30,9 +30,9 @@
     def _get_writer(self, path, generator):
         try:
             writer = utils.XmlWriter(path)
-        except:
- raise DataError("Opening output file '%s' for writing failed: %s"
-                            % (path, utils.get_error_message()))
+        except EnvironmentError, err:
+            raise DataError("Opening output file '%s' failed: %s"
+                            % (path, err.strerror))
         writer.start('robot', {'generator': get_full_version(generator),
                                'generated': utils.get_timestamp()})
         return writer

Reply via email to