Bug 52756 – nrwt: remove fs refs from printing, test_failures, test_expectations, text_diff

• Status: RESOLVED
• Resolution: FIXED
• Component: New Bugs

[Dirk Pranke]

nrwt: remove fs refs from printing, test_failures, test_expectations, text_diff

[Dirk Pranke]

Created attachment 79502 [details]
Patch

[Eric Seidel (no email)]

Comment on attachment 79502 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=79502&action=review

> Tools/Scripts/webkitpy/layout_tests/layout_package/test_failures.py:126
> -        return os.path.splitext(filename)[0] + modifier
> +        # FIXME: technically this breaks if files don't use ".ext" to indicate
> +        # the extension, but passing in a Filesystem object here is a huge
> +        # hassle.
> +        return filename[filename.rfind('.')] + modifier

I might have just left this using os.path.splitext with a FIXME about using filesystem instead.

> Tools/Scripts/webkitpy/layout_tests/test_types/text_diff.py:-36
> -from __future__ import with_statement

We're sure this isn't needed?

[Eric Seidel (no email)]

Comment on attachment 79502 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=79502&action=review

>> Tools/Scripts/webkitpy/layout_tests/layout_package/test_failures.py:126
>> +        return filename[filename.rfind('.')] + modifier
> 
> I might have just left this using os.path.splitext with a FIXME about using filesystem instead.

Does this need testing?

[Dirk Pranke]

Committed r76288: <http://trac.webkit.org/changeset/76288>

[Dirk Pranke]

In reply to comment #2)
> (From update of attachment 79502 [details])
> View in context: https://bugs.webkit.org/attachment.cgi?id=79502&action=review
> 
> > Tools/Scripts/webkitpy/layout_tests/layout_package/test_failures.py:126
> > -        return os.path.splitext(filename)[0] + modifier
> > +        # FIXME: technically this breaks if files don't use ".ext" to indicate
> > +        # the extension, but passing in a Filesystem object here is a huge
> > +        # hassle.
> > +        return filename[filename.rfind('.')] + modifier
> 
> I might have just left this using os.path.splitext with a FIXME about using filesystem instead.
> 

I felt it was better to not have any reference to os.path at all. 

> > Tools/Scripts/webkitpy/layout_tests/test_types/text_diff.py:-36
> > -from __future__ import with_statement
> 
> We're sure this isn't needed?

Yes. There are no "with" statements in the file.

[Dirk Pranke]

(In reply to comment #3)
> (From update of attachment 79502 [details])
> View in context: https://bugs.webkit.org/attachment.cgi?id=79502&action=review
> 
> >> Tools/Scripts/webkitpy/layout_tests/layout_package/test_failures.py:126
> >> +        return filename[filename.rfind('.')] + modifier
> > 
> > I might have just left this using os.path.splitext with a FIXME about using filesystem instead.
> 
> Does this need testing?

It is covered by the existing tests.

[Dirk Pranke]

(In reply to comment #6)
> (In reply to comment #3)
> > (From update of attachment 79502 [details] [details])
> > View in context: https://bugs.webkit.org/attachment.cgi?id=79502&action=review
> > 
> > >> Tools/Scripts/webkitpy/layout_tests/layout_package/test_failures.py:126
> > >> +        return filename[filename.rfind('.')] + modifier
> > > 
> > > I might have just left this using os.path.splitext with a FIXME about using filesystem instead.
> > 
> > Does this need testing?
> 
> It is covered by the existing tests.

Or so I thought :( . See bug 52854.