Skip to content

Commit

Permalink
Cherry-pick 273948@main (7df0ea2). https://bugs.webkit.org/show_bug.c…
Browse files Browse the repository at this point in the history
…gi?id=268510

    Use a mock git for most of SummarizedResultsTest
    https://bugs.webkit.org/show_bug.cgi?id=268510

    Reviewed by Jonathan Bedard.

    None of these tests actually are looking at the output from git
    whatsoever, and with many remotes and branches actually querying git can
    be slow, so just use a mock git object instead.

    Lastly, mark the one test that still uses real git as slow.

    * Tools/Scripts/webkitpy/layout_tests/models/test_run_results_unittest.py:
    (SummarizedResultsTest.test_no_git_revision):
    (SummarizedResultsTest.test_summarized_results_wontfix):
    (SummarizedResultsTest.test_summarized_results_include_passes):
    (SummarizedResultsTest.test_summarized_results_world_leaks_disabled):
    (SummarizedResultsTest.test_summarized_run_metadata):
    (SummarizedResultsTest.test_git_revision_exists): Deleted.

    Canonical link: https://commits.webkit.org/273948@main

Canonical link: https://commits.webkit.org/272448.596@safari-7618-branch
  • Loading branch information
gsnedders authored and JonWBedard committed Feb 21, 2024
1 parent 77a14b1 commit 1f0f20b
Showing 1 changed file with 24 additions and 25 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -158,41 +158,40 @@ def test_no_git_revision(self):
summary = summarized_results(self.port, expected=False, passing=False, flaky=False)
self.assertNotIn('revision', summary)

def test_git_revision_exists(self):
self.port._options.builder_name = 'dummy builder'
summary = summarized_results(self.port, expected=False, passing=False, flaky=False)
self.assertNotEqual(summary['revision'], '')

def test_git_revision_identifier(self):
with mocks.local.Git(path='/'), OutputCapture():
self.port._options.builder_name = 'dummy builder'
summary = summarized_results(self.port, expected=False, passing=False, flaky=False)
self.assertEqual(summary['revision'], '5@main')

def test_summarized_results_wontfix(self):
self.port._options.builder_name = 'dummy builder'
summary = summarized_results(self.port, expected=False, passing=False, flaky=False)
self.assertTrue(summary['tests']['failures']['expected']['hang.html']['wontfix'])
with mocks.local.Git(path='/'), OutputCapture():
self.port._options.builder_name = 'dummy builder'
summary = summarized_results(self.port, expected=False, passing=False, flaky=False)
self.assertTrue(summary['tests']['failures']['expected']['hang.html']['wontfix'])

def test_summarized_results_include_passes(self):
self.port._options.builder_name = 'dummy builder'
summary = summarized_results(self.port, expected=False, passing=True, flaky=False, include_passes=True)
self.assertEqual(summary['tests']['passes']['text.html']['expected'], 'PASS')
with mocks.local.Git(path='/'), OutputCapture():
self.port._options.builder_name = 'dummy builder'
summary = summarized_results(self.port, expected=False, passing=True, flaky=False, include_passes=True)
self.assertEqual(summary['tests']['passes']['text.html']['expected'], 'PASS')

def test_summarized_results_world_leaks_disabled(self):
self.port._options.builder_name = 'dummy builder'
summary = summarized_results(self.port, expected=False, passing=True, flaky=False, include_passes=True)
self.assertEqual(summary['tests']['failures']['expected']['leak.html']['expected'], 'PASS')
with mocks.local.Git(path='/'), OutputCapture():
self.port._options.builder_name = 'dummy builder'
summary = summarized_results(self.port, expected=False, passing=True, flaky=False, include_passes=True)
self.assertEqual(summary['tests']['failures']['expected']['leak.html']['expected'], 'PASS')

def test_summarized_run_metadata(self):
self.port._options.builder_name = 'dummy builder'
summary = summarized_results(self.port, expected=False, passing=True, flaky=False, include_passes=True)
self.assertEqual(summary['port_name'], 'test-mac-leopard')
self.assertEqual(
summary['test_configuration'],
{'version': 'leopard', 'architecture': 'x86', 'build_type': 'release'},
)
self.assertEqual(
summary['baseline_search_path'],
['platform/test-mac-leopard', 'platform/test-mac-snowleopard'],
)
with mocks.local.Git(path='/'), OutputCapture():
self.port._options.builder_name = 'dummy builder'
summary = summarized_results(self.port, expected=False, passing=True, flaky=False, include_passes=True)
self.assertEqual(summary['port_name'], 'test-mac-leopard')
self.assertEqual(
summary['test_configuration'],
{'version': 'leopard', 'architecture': 'x86', 'build_type': 'release'},
)
self.assertEqual(
summary['baseline_search_path'],
['platform/test-mac-leopard', 'platform/test-mac-snowleopard'],
)

0 comments on commit 1f0f20b

Please sign in to comment.