Code Review
/
vswitchperf.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "python: Pylint 1.8.2 code conformity"
[vswitchperf.git]
/
conf
/
__init__.py
diff --git
a/conf/__init__.py
b/conf/__init__.py
index
a7c0ee5
..
83c5475
100644
(file)
--- a/
conf/__init__.py
+++ b/
conf/__init__.py
@@
-70,7
+70,7
@@
class Settings(object):
except AttributeError:
pass
return param
except AttributeError:
pass
return param
- elif isinstance(param,
list) or isinstance(param, tuple
):
+ elif isinstance(param,
(list, tuple)
):
tmp_list = []
for item in param:
tmp_list.append(self._eval_param(item))
tmp_list = []
for item in param:
tmp_list.append(self._eval_param(item))
@@
-124,6
+124,13
@@
class Settings(object):
if name is not None and value is not None:
super(Settings, self).__setattr__(name, value)
if name is not None and value is not None:
super(Settings, self).__setattr__(name, value)
+ def resetValue(self, attr):
+ """If parameter was overridden by TEST_PARAMS, then it will
+ be set to its original value.
+ """
+ if attr in self.__dict__['TEST_PARAMS']:
+ self.__dict__['TEST_PARAMS'].pop(attr)
+
def load_from_file(self, path):
"""Update ``settings`` with values found in module at ``path``.
"""
def load_from_file(self, path):
"""Update ``settings`` with values found in module at ``path``.
"""
@@
-222,7
+229,7
@@
class Settings(object):
if key not in self.__dict__ and key not in _EXTRA_TEST_PARAMS:
unknown_keys.append(key)
if key not in self.__dict__ and key not in _EXTRA_TEST_PARAMS:
unknown_keys.append(key)
- if
len(unknown_keys)
:
+ if
unknown_keys
:
raise RuntimeError('Test parameters contain unknown configuration '
'parameter(s): {}'.format(', '.join(unknown_keys)))
raise RuntimeError('Test parameters contain unknown configuration '
'parameter(s): {}'.format(', '.join(unknown_keys)))
@@
-263,7
+270,7
@@
class Settings(object):
for vmindex in range(vm_number):
value = master_value_str.replace('#VMINDEX', str(vmindex))
for macro, args, param, _, step in re.findall(_PARSE_PATTERN, value):
for vmindex in range(vm_number):
value = master_value_str.replace('#VMINDEX', str(vmindex))
for macro, args, param, _, step in re.findall(_PARSE_PATTERN, value):
- multi = int(step) if
len(step)
and int(step) else 1
+ multi = int(step) if
step
and int(step) else 1
if macro == '#EVAL':
# pylint: disable=eval-used
tmp_result = str(eval(param))
if macro == '#EVAL':
# pylint: disable=eval-used
tmp_result = str(eval(param))
@@
-318,12
+325,18
@@
class Settings(object):
assert result == self.getValue(attr)
return True
assert result == self.getValue(attr)
return True
- def validate_setValue(self, dummy_result, name, value):
+ def validate_setValue(self,
_
dummy_result, name, value):
"""Verifies, that value was correctly set
"""
assert value == self.__dict__[name]
return True
"""Verifies, that value was correctly set
"""
assert value == self.__dict__[name]
return True
+ def validate_resetValue(self, _dummy_result, attr):
+ """Verifies, that value was correctly reset
+ """
+ return 'TEST_PARAMS' not in self.__dict__ or \
+ attr not in self.__dict__['TEST_PARAMS']
+
settings = Settings()
def get_test_param(key, default=None):
settings = Settings()
def get_test_param(key, default=None):