Bug 82933 – check-webkit-style errors when removing .png files

• Status: RESOLVED
• Resolution: FIXED
• Component: Tools / Tests

[Florin Malita]

After http://trac.webkit.org/changeset/112270, removing .png files triggers the following:

Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'LayoutTests/ChangeLog', u'LayoutTests/plat..." exit_code: 1
ERROR: File does not exist: 'LayoutTests/platform/mac/transforms/no_transform_hit_testing-expected.png'


Looks like we're force-processing non-existent (removed) png files (patchreader.py:66):

            if not line_numbers:
                match = re.search("\s*png$", path)
                if match:
                    if call_only_once:
                        self._text_file_reader.process_file(file_path=path, line_numbers=None)

[Philip Rogers]

I'm hitting this as well, using vanilla SVN.

[Tony Chang]

Created attachment 135195 [details]
Patch

[Adam Barth]

Comment on attachment 135195 [details]
Patch

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

> Tools/Scripts/webkitpy/style/patchreader.py:55
> -    def check(self, patch_string):
> +    def check(self, patch_string, fs=FileSystem()):

Eric doesn't like this pattern because it creates a static FileSystem() object that's re-used each time this function is called, but maybe it's ok here since FileSystem is normally global-ish object.

[Tony Chang]

Created attachment 135201 [details]
Patch for landing

[Tony Chang]

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

>> Tools/Scripts/webkitpy/style/patchreader.py:55
>> +    def check(self, patch_string, fs=FileSystem()):
> 
> Eric doesn't like this pattern because it creates a static FileSystem() object that's re-used each time this function is called, but maybe it's ok here since FileSystem is normally global-ish object.

Yeah, I thought it was OK in this case because FileSystem has no state.  I guess that might not be true in the future so I'll change it to None.

[Tony Chang]

Committed r112963: <http://trac.webkit.org/changeset/112963>