Revision: 3385415ddcec
Author: Janne Härkönen <[email protected]>
Date: Tue Jun 21 03:38:57 2011
Log: oops, handle suite stat level correctly
http://code.google.com/p/robotframework/source/detail?r=3385415ddcec
Modified:
/src/robot/conf/settings.py
=======================================
--- /src/robot/conf/settings.py Mon Jun 20 09:45:44 2011
+++ /src/robot/conf/settings.py Tue Jun 21 03:38:57 2011
@@ -90,7 +90,7 @@
if name == 'OutputDir':
return utils.abspath(value)
if name in ['SuiteStatLevel', 'MonitorWidth']:
- return self._convert_to_positive_integer(name, value)
+ return self._convert_to_positive_integer_or_default(name,
value)
if name in ['Listeners', 'VariableFiles']:
return [self._split_args_from_name(item) for item in value]
if name == 'TagStatCombine':
@@ -176,9 +176,9 @@
"Expected 'tag:link:title' but got '%s'." % value)
return None
- def _convert_to_positive_integer(self, name, value):
+ def _convert_to_positive_integer_or_default(self, name, value):
value = self._convert_to_integer(name, value)
- return value if value > 0 else 1
+ return value if value > 0 else self._get_default_value(name)
def _convert_to_integer(self, name, value):
try:
@@ -186,7 +186,10 @@
except ValueError:
LOGGER.error("Option '--%s' expected integer value but
got '%s'. "
"Default value used instead." % (name.lower(),
value))
- return self._cli_opts[name][1]
+ return self._get_default_value(name)
+
+ def _get_default_value(self, name):
+ return self._cli_opts[name][1]
def _split_args_from_name(self, name):
if ':' not in name or os.path.exists(name):
