Revision: 2983
Author: janne.t.harkonen
Date: Wed Apr 14 12:38:37 2010
Log: proper error message when library setting has no value
http://code.google.com/p/robotframework/source/detail?r=2983
Modified:
/trunk/src/robot/parsing/metadata.py
=======================================
--- /trunk/src/robot/parsing/metadata.py Wed Apr 14 06:08:25 2010
+++ /trunk/src/robot/parsing/metadata.py Wed Apr 14 12:38:37 2010
@@ -144,7 +144,13 @@
self.value = None
def original_value(self):
- return self._item.copy().value
+ orig = self._item.copy().value
+ self._at_least_one_value_required(orig)
+ return orig
+
+ def _at_least_one_value_required(self, values):
+ if len(values) == 0:
+ raise DataError("Setting '%s' requires a value" % self.name)
def replace_variables(self, variables):
item = self._item.copy()
@@ -153,8 +159,7 @@
except DataError:
raise DataError("Replacing variables from setting '%s'
failed: %s"
% (self.name, utils.get_error_message()))
- if len(self.value) == 0:
- raise DataError("Setting '%s' requires a value" % self.name)
+ self._at_least_one_value_required(self.value)
if self.name == 'Resource' and len(self.value) > 1:
raise DataError('Invalid resource import parameters: %s' %
utils.seq2str2(self.value))
basedir = utils.get_directory(item._parent._source)
--
To unsubscribe, reply using "remove me" as the subject.
