Revision: 613fd40fd9d6
Author: Mikko Korpela <[email protected]>
Date: Mon Jan 16 05:02:08 2012
Log: TidyLib: rename keyword
http://code.google.com/p/robotframework/source/detail?r=613fd40fd9d6
Modified:
/atest/robot/tidy/TidyLib.py
/atest/robot/tidy/tidy.txt
=======================================
--- /atest/robot/tidy/TidyLib.py Fri Jan 13 05:46:27 2012
+++ /atest/robot/tidy/TidyLib.py Mon Jan 16 05:02:08 2012
@@ -13,7 +13,7 @@
def __init__(self, interpreter):
self._cmd = [interpreter, '-m', 'robot.tidy']
- def run_tidy(self, input, options):
+ def run_tidy_and_return_output(self, input, options):
options = options.split(' ') if options else []
with tempfile.TemporaryFile() as output:
rc = call(self._cmd + options + [self._path(input)],
@@ -26,7 +26,7 @@
return content
def run_tidy_and_check_result(self, input, options, expected):
- result = self.run_tidy(input, options)
+ result = self.run_tidy_and_return_output(input, options)
self._assert_result(result, open(self._path(expected)).read())
def _path(self, path):
=======================================
--- /atest/robot/tidy/tidy.txt Mon Jan 16 04:01:53 2012
+++ /atest/robot/tidy/tidy.txt Mon Jan 16 05:02:08 2012
@@ -44,7 +44,7 @@
Tidying many files in place
[Setup] Copy Golden Files
List Directory ${TIDYDIR}
- Run tidy ${TIDYDIR}/golden* --inplace --format html
+ Run tidy and return output ${TIDYDIR}/golden* --inplace --format
html
List Directory ${TIDYDIR}
Check file count ${TIDYDIR} *.html 2
Check file count ${TIDYDIR} *.txt 0
@@ -54,7 +54,7 @@
Tidying directory
[Setup] Copy Directory ${DATADIR}/tests ${TEMPDIR}/tests
${output_before}= Run Robot Directly ${DATADIR}/tests
- Run Tidy ${TEMPDIR}/tests --recursive --format tsv
+ Run Tidy and return output ${TEMPDIR}/tests --recursive --format
tsv
Check file count ${TEMPDIR}/tests *.tsv 2
Check file count ${TEMPDIR}/tests *.txt 0
${output_after}= Run Robot Directly ${TEMPDIR}/tests
