Tools/ChangeLog

2011-04-19  Eric Seidel  <eric@webkit.org>

        Reviewed by NOBODY (OOPS!).

        The commit-queue is confused when non-layout tests fail

        https://bugs.webkit.org/show_bug.cgi?id=58955

        As seen in http://queues.webkit.org/results/8474435

        It fails to create an archive of the layout test results

        and then throws an exception.

        I've fixed this by making it catch the exception as well

        as made it so it never calls that path in the common case.

        I've updated MockFileSystem to understand rmtree's affect on

        directories as well as files.

        * Scripts/webkitpy/common/system/filesystem_mock.py:

        * Scripts/webkitpy/common/system/workspace.py:

        * Scripts/webkitpy/tool/commands/queues.py:

        * Scripts/webkitpy/tool/commands/queues_unittest.py:

        * Scripts/webkitpy/tool/mocktool.py:

2011-04-19  Ojan Vafai  <ojan@chromium.org>

        Fix check for whether a failure is expected to deal with

Tools/Scripts/webkitpy/common/system/filesystem_mock.py

@@class MockFileSystem(object):

            return False

        path = self.normpath(path)

        if path in self.dirs:

150 return True

150 return self.dirs[path] is not None

        # We need to use a copy of the keys here in order to avoid switching

        # to a different thread and potentially modifying the dict in

@@class MockFileSystem(object):

        self.written_files[path] = None

    def rmtree(self, path):

270 if not path.endswith(self.sep):

271 path += self.sep

270 path = self.normpath(path)

        for f in self.files:

            if f.startswith(path):

                self.files[f] = None

        for d in self.dirs:

            if d.startswith(path):

                self.dirs[d] = None

    def splitext(self, path):

        idx = path.rfind('.')

        if idx == -1:

Tools/Scripts/webkitpy/common/system/workspace.py

# A home for file logic which should sit above FileSystem, but

# below more complicated objects.

32import logging

3233import zipfile

3334

_log = logging.getLogger(__name__)

class Workspace(object):

    def __init__(self, filesystem, executive):

        self._filesystem = filesystem

@@class Workspace(object):

        #         zip_file.write(os.path.relpath(path, source_path))

        # However, getting the paths, encoding and compression correct could be non-trivial.

        # So, for now we depend on the environment having "zip" installed (likely fails on Win32)

60 self._executive.run_command(['zip', '-r', zip_path, source_path])

        try:

            self._executive.run_command(['zip', '-r', zip_path, source_path])

        except ScriptError, e:

            _log.error("Workspace.create_zip failed:\n%s" % e.message_with_output())

            return None

6171 return zip_class(zip_path)

Tools/Scripts/webkitpy/tool/commands/queues.py

@@class CommitQueue(AbstractPatchQueue, StepSequenceErrorHandler, CommitQueueTaskD

        zip_path = self._tool.workspace.find_unused_filename(self._log_directory(), "%s-%s" % (patch.bug_id(), results_name), "zip")

        if not zip_path:

            return None

        if not self._tool.filesystem.isdir(results_directory):

            log("%s does not exist, not archiving." % results_directory)

            return None

        archive = self._tool.workspace.create_zip(zip_path, results_directory)

        # Remove the results directory to prevent http logs, etc. from getting huge between runs.

        # We could have create_zip remove the original, but this is more explicit.

Tools/Scripts/webkitpy/tool/commands/queues_unittest.py

@@The commit-queue is continuing to process your patch.

    def test_archive_last_layout_test_results(self):

        queue = CommitQueue()

406 queue.bind_to_tool(MockTool())

406 tool = MockTool()

407 queue.bind_to_tool(tool)

407408 patch = queue._tool.bugs.fetch_attachment(128)

408 # This is just to test that the method doesn't raise.

409 queue.archive_last_layout_test_results(patch)

        # Should fail because the results_directory does not exist.

        expected_stderr = "/mock does not exist, not archiving.\n"

        archive = OutputCapture().assert_outputs(self, queue.archive_last_layout_test_results, [patch], expected_stderr=expected_stderr)

        self.assertEqual(archive, None)

        results_directory = "/mock"

        # Sanity check what we assume our mock results directory is.

        self.assertEqual(queue._results_directory(), results_directory)

        tool.filesystem.maybe_make_directory(results_directory)

        self.assertTrue(tool.filesystem.exists(results_directory))

        self.assertNotEqual(queue.archive_last_layout_test_results(patch), None)

        self.assertFalse(tool.filesystem.exists(results_directory))

    def test_upload_results_archive_for_patch(self):

        queue = CommitQueue()

Tools/Scripts/webkitpy/tool/mocktool.py

@@class MockWorkspace(object):

        return "%s/%s.%s" % (directory, name, extension)

    def create_zip(self, zip_path, source_path):

731 pass

731 return object() # Something that is not None

class MockTool(object):