<div dir="ltr">On 15 October 2013 03:13, Dylan Baker <<a href="mailto:baker.dylan.c@gmail.com" target="_blank">baker.dylan.c@gmail.com</a>> wrote: <div class="gmail_extra"><div class="gmail_quote"> <blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">This is the commonly excepted "right way" in python. Signed-off-by: Dylan Baker <<a href="mailto:baker.dylan.c@gmail.com">baker.dylan.c@gmail.com</a>> </blockquote><div> </div><div>Something in this series regressed the "changes", "problems", and "regressions" links in the piglit HTML output. As of commit aaae592 (summary.py: Fix regression in Summary class) those pages show up empty, even if there really are changes, problems, or regressions. In commit ad97d8b (summary.py: Replace ``import from'' syntax with import), the links work fine. I can't bisect further because of the regression fixed in commit aaae592. </div><div>I don't know whether the "skipped" and "fixes" links work properly or not. </div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"> --- framework/summary.py | 77 ++++++++++++++++++++++++---------------------------- 1 file changed, 36 insertions(+), 41 deletions(-) diff --git a/framework/summary.py b/framework/summary.py index 3ab71f3..359d078 100644 --- a/framework/summary.py +++ b/framework/summary.py @@ -428,13 +428,12 @@ class Summary: for each in self.results: os.mkdir(path.join(destination, <a href="http://each.name" target="_blank">each.name</a>)) - file = open(path.join(destination, <a href="http://each.name" target="_blank">each.name</a>, "index.html"), 'w') - file.write(testindex.render(name=<a href="http://each.name" target="_blank">each.name</a>, - time=each.time_elapsed, - options=each.options, - glxinfo=each.glxinfo, - lspci=each.lspci)) - file.close() + with open(path.join(destination, <a href="http://each.name" target="_blank">each.name</a>, "index.html"), 'w') as out: + out.write(testindex.render(name=<a href="http://each.name" target="_blank">each.name</a>, + time=each.time_elapsed, + options=each.options, + glxinfo=each.glxinfo, + lspci=each.lspci)) # Then build the individual test results for key, value in each.tests.iteritems(): @@ -447,21 +446,19 @@ class Summary: if not path.exists(temp_path): os.makedirs(temp_path) - file = open(path.join(destination, - <a href="http://each.name" target="_blank">each.name</a>, - key + ".html"), 'w') - file.write(testfile.render( - testname=key, - status=value.get('result', 'None'), - returncode=value.get('returncode', 'None'), - time=value.get('time', 'None'), - info=value.get('info', 'None'), - traceback=value.get('traceback', 'None'), - command=value.get('command', 'None'), - dmesg=value.get('dmesg', 'None'), - css=path.relpath(result_css, temp_path), - index=path.relpath(index, temp_path))) - file.close() + with open(path.join(destination, <a href="http://each.name" target="_blank">each.name</a>, key + ".html"), + 'w') as out: + out.write(testfile.render( + testname=key, + status=value.get('result', 'None'), + returncode=value.get('returncode', 'None'), + time=value.get('time', 'None'), + info=value.get('info', 'None'), + traceback=value.get('traceback', 'None'), + command=value.get('command', 'None'), + dmesg=value.get('dmesg', 'None'), + css=path.relpath(result_css, temp_path), + index=path.relpath(index, temp_path))) # Finally build the root html files: index, regressions, etc index = Template(filename="templates/index.mako", @@ -477,30 +474,28 @@ class Summary: # Index.html is a bit of a special case since there is index, all, and # alltests, where the other pages all use the same name. ie, # changes.html, self.changes, and page=changes. - file = open(path.join(destination, "index.html"), 'w') - file.write(index.render(results=HTMLIndex(self, self.tests['all']), - page='all', - pages=pages, - colnum=len(self.results), - exclude=exclude)) - file.close() + with open(path.join(destination, "index.html"), 'w') as out: + out.write(index.render(results=HTMLIndex(self, self.tests['all']), + page='all', + pages=pages, + colnum=len(self.results), + exclude=exclude)) # Generate the rest of the pages for page in pages: - file = open(path.join(destination, page + '.html'), 'w') + with open(path.join(destination, page + '.html'), 'w') as out: # If there is information to display display it - if self.tests[page]: - file.write(index.render(results=HTMLIndex(self, - self.tests[page]), - pages=pages, - page=page, - colnum=len(self.results), - exclude=exclude)) - # otherwise provide an empty page - else: - file.write(empty_status.render(page=page, pages=pages)) + if self.tests[page]: + out.write(index.render(results=HTMLIndex(self, + self.tests[page]), + pages=pages, + page=page, + colnum=len(self.results), + exclude=exclude)) + # otherwise provide an empty page + else: + out.write(empty_status.render(page=page, pages=pages)) - file.close() def generate_text(self, diff, summary): """ Write summary information to the console """ -- 1.8.1.5 _______________________________________________ Piglit mailing list <a href="mailto:Piglit@lists.freedesktop.org">Piglit@lists.freedesktop.org</a> <a href="http://lists.freedesktop.org/mailman/listinfo/piglit" target="_blank">http://lists.freedesktop.org/mailman/listinfo/piglit</a> </blockquote></div> </div></div>