<div dir="ltr"> <div class="gmail_extra"> <div class="gmail_quote">On Sat, Aug 30, 2014 at 4:20 PM, Dylan Baker <<a href="mailto:baker.dylan.c@gmail.com" target="_blank">baker.dylan.c@gmail.com</a>> wrote: <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">This causes problems in the html summary generator, since os.mkdir doesn't understand that it's a string not a full path (and the underlying file system probably can't understand that either). Instead of raising an error we silently replace any illegal characters with an underscore. Signed-off-by: Dylan Baker <<a href="mailto:dylanx.c.baker@intel.com">dylanx.c.baker@intel.com</a>> --- framework/results.py | 21 ++++++++++++++++++++- framework/tests/results_tests.py | 16 ++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/framework/results.py b/framework/results.py index efc7029..c89b39c 100644 --- a/framework/results.py +++ b/framework/results.py @@ -305,7 +305,7 @@ class TestrunResult(object): 'lspci', 'results_version', 'time_elapsed'] - <a href="http://self.name" target="_blank">self.name</a> = None + self.__name = None self.uname = None self.options = None self.glxinfo = None @@ -406,6 +406,25 @@ class TestrunResult(object): if k in self.serialized_keys), f, default=_piglit_encoder, indent=JSONWriter.INDENT) + @property + def name(self): + return self.__name + + @name.setter + def name(self, name): + """ Set the name of the test run + + We don't allow path seperators in the name, they are silently replaced + with underscores. + + """ + replace = ['/', '\\'] + + for r in replace: + name = name.replace(r, '_') + + self.__name = name + </blockquote><div> </div><div>Personally, I'd rather we mangle things when we turn them into file names rather than mangling the original. This way the original string still shows up in table headers etc. That said, this also accomplishes the objective of not crashing in stupid places. </div><div>--Jason </div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> def load_results(filename): """ Loader function for TestrunResult class diff --git a/framework/tests/results_tests.py b/framework/tests/results_tests.py index 54661cc..02438cf 100644 --- a/framework/tests/results_tests.py +++ b/framework/tests/results_tests.py @@ -159,3 +159,19 @@ def test_update_results_old(): res = results.update_results(base, <a href="http://f.name" target="_blank">f.name</a>) nt.assert_equal(res.results_version, results.CURRENT_JSON_VERSION) + + +@utils.nose_generator +def test_testrunresult_set_name(): + """ Generate tests for the name setter """ + emsg = '"{}" should have been replaced but was not' + + def test(value, expected, message): + """ The actual test """ + t = results.TestrunResult() + <a href="http://t.name" target="_blank">t.name</a> = value + nt.assert_equal(<a href="http://t.name" target="_blank">t.name</a>, expected, msg=message) + + for x in ['/', '\\']: + test.description = 'TestrunResult.name replaces "{}" with "_"'.format(x) + yield test, 'a{}name'.format(x), 'a_name', emsg.format(x) -- 2.1.0 _______________________________________________ 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>