Skip to content

Fix PerfRepoReport permission code #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jtluka wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fix PerfRepoReport permission code #7

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9eebd83
PerfRepoReport: fix parsing report without permissions
jtluka Aug 15, 2017
967d0cc
PerfRepoReport: include permissions in output of to_xml() method
jtluka Aug 15, 2017
8622aed
PerfRepoReportPermission: remove search for non-existent id tag
jtluka Aug 15, 2017
b015947
PerfRepoReportPermission: use correct tag for permission in to_xml() …
jtluka Aug 15, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 15 additions & 9 deletions perfrepo/PerfRepoReport.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,14 @@ def __init__(self, xml=None):
recursive_dict_update(self._properties, tmp_dict)

self._permissions = []
for entry in root.find("permissions"):
if entry.tag != "permission":
continue
self._permissions.append(PerfRepoReportPermission(entry))
self._permissions[-1].set_report_id(self._id)
self._permissions[-1].validate()
perms = root.find("permissions")
if perms is not None:
for entry in perms:
if entry.tag != "permission":
continue
self._permissions.append(PerfRepoReportPermission(entry))
self._permissions[-1].set_report_id(self._id)
self._permissions[-1].validate()
else:
raise PerfRepoException("Parameter xml must be"\
" a string, an Element or None")
Expand Down Expand Up @@ -379,6 +381,12 @@ def to_xml(self):
self._set_element_atrib(value_elem, 'name', prop[0])
self._set_element_atrib(value_elem, 'value', prop[1])

if len(self._permissions):
perms_elem = ElementTree.SubElement(root, 'permissions')
for perm in self._permissions:
perm_elem = perm.to_xml()
perms_elem.append(perm_elem)

return root

def __str__(self):
Expand Down Expand Up @@ -420,8 +428,6 @@ def __init__(self, xml=None):
if root.tag != "report-permission" and root.tag != "permission":
raise PerfRepoException("Invalid xml.")

self._id = root.find("id").text

try:
self._report_id = root.find("report-id").text
except:
Expand Down Expand Up @@ -502,7 +508,7 @@ def get_group_id(self):
def to_xml(self):
self.validate()

root = Element('report-permission')
root = Element('permission')

id_elem = ElementTree.SubElement(root, 'report-id')
id_elem.text = str(self._report_id)
Expand Down