sascha/workload-automation
1
0
Fork 0
mirror of https://github.com/ARM-software/workload-automation.git synced 2025-11-04 00:52:08 +00:00
Code Issues Releases Wiki Activity

Merge pull request #95 from ep1cman/fixes

Browse Source 
Parameter: Fixed overriding of new parameters
This commit is contained in:
setrofim
2016-02-04 15:42:01 +00:00
parent 28ef01505d 519efaf22c
commit f92bd1bcdd
2 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
wlauto/core/extension.py
View File

@@ -41,9 +41,10 @@ class AttributeCollection(object):
def values(self): def values(self):
return self._attrs.values() return self._attrs.values()
def __init__(self, attrcls): def __init__(self, attrcls, owner):
self._attrcls = attrcls self._attrcls = attrcls
self._attrs = OrderedDict() self._attrs = OrderedDict()
self.owner = owner
def add(self, p): def add(self, p):
p = self._to_attrcls(p) p = self._to_attrcls(p)
@@ -53,6 +54,8 @@ class AttributeCollection(object):
for a, v in p.__dict__.iteritems(): for a, v in p.__dict__.iteritems():
if v is not None: if v is not None:
setattr(newp, a, v) setattr(newp, a, v)
if not hasattr(newp, "_overridden"):
newp._overridden = self.owner
self._attrs[p.name] = newp self._attrs[p.name] = newp
else: else:
# Duplicate attribute condition is check elsewhere. # Duplicate attribute condition is check elsewhere.
@@ -107,7 +110,7 @@ class AttributeCollection(object):
class AliasCollection(AttributeCollection): class AliasCollection(AttributeCollection):
def __init__(self): def __init__(self):
super(AliasCollection, self).__init__(Alias) super(AliasCollection, self).__init__(Alias, None)
def _to_attrcls(self, p): def _to_attrcls(self, p):
if isinstance(p, tuple) or isinstance(p, list): if isinstance(p, tuple) or isinstance(p, list):
@@ -122,8 +125,9 @@ class AliasCollection(AttributeCollection):
class ListCollection(list): class ListCollection(list):
def __init__(self, attrcls): # pylint: disable=unused-argument def __init__(self, attrcls, owner): # pylint: disable=unused-argument
super(ListCollection, self).__init__() super(ListCollection, self).__init__()
self.owner = owner
class Param(object): class Param(object):
@@ -401,14 +405,14 @@ class ExtensionMeta(type):
global_virtuals = ['initialize', 'finalize'] global_virtuals = ['initialize', 'finalize']
def __new__(mcs, clsname, bases, attrs): def __new__(mcs, clsname, bases, attrs):
mcs._propagate_attributes(bases, attrs) mcs._propagate_attributes(bases, attrs, clsname)
cls = type.__new__(mcs, clsname, bases, attrs) cls = type.__new__(mcs, clsname, bases, attrs)
mcs._setup_aliases(cls) mcs._setup_aliases(cls)
mcs._implement_virtual(cls, bases) mcs._implement_virtual(cls, bases)
return cls return cls
@classmethod @classmethod
def _propagate_attributes(mcs, bases, attrs): def _propagate_attributes(mcs, bases, attrs, clsname):
""" """
For attributes specified by to_propagate, their values will be a union of For attributes specified by to_propagate, their values will be a union of
that specified for cls and its bases (cls values overriding those of bases that specified for cls and its bases (cls values overriding those of bases
@@ -417,15 +421,22 @@ class ExtensionMeta(type):
""" """
for prop_attr, attr_cls, attr_collector_cls in mcs.to_propagate: for prop_attr, attr_cls, attr_collector_cls in mcs.to_propagate:
should_propagate = False should_propagate = False
propagated = attr_collector_cls(attr_cls) propagated = attr_collector_cls(attr_cls, clsname)
for base in bases: for base in bases:
if hasattr(base, prop_attr): if hasattr(base, prop_attr):
propagated += getattr(base, prop_attr) or [] propagated += getattr(base, prop_attr) or []
should_propagate = True should_propagate = True
if prop_attr in attrs: if prop_attr in attrs:
propagated += attrs[prop_attr] or [] pattrs = attrs[prop_attr] or []
propagated += pattrs
should_propagate = True should_propagate = True
if should_propagate: if should_propagate:
for p in propagated:
override = bool(getattr(p, "override", None))
overridden = bool(getattr(p, "_overridden", None))
if override != overridden:
msg = "Overriding non existing parameter '{}' inside '{}'"
raise ValueError(msg.format(p.name, clsname))
attrs[prop_attr] = propagated attrs[prop_attr] = propagated
@classmethod @classmethod

9
wlauto/tests/test_extension.py
View File

@@ -324,7 +324,14 @@ class ParametersTest(TestCase):
def test_duplicate_param_override(self): def test_duplicate_param_override(self):
class DuplicateParamExtension(MyBaseExtension): # pylint: disable=W0612 class DuplicateParamExtension(MyBaseExtension): # pylint: disable=W0612
parameters = [ parameters = [
Parameter('food', override=True, default='cheese'), Parameter('base', override=True, default='buttery'),
Parameter('base', override=True, default='biscuit'),
]
@raises(ValueError)
def test_overriding_new_param(self):
class DuplicateParamExtension(MyBaseExtension): # pylint: disable=W0612
parameters = [
Parameter('food', override=True, default='cheese'), Parameter('food', override=True, default='cheese'),
] ]