Modified: trunk/Tools/Scripts/webkitpy/common/checkout/scm/stub_repository.py (257795 => 257796)
--- trunk/Tools/Scripts/webkitpy/common/checkout/scm/stub_repository.py 2020-03-03 20:24:10 UTC (rev 257795)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/scm/stub_repository.py 2020-03-03 21:08:50 UTC (rev 257796)
@@ -37,10 +37,8 @@
class StubRepository(SCM):
_stub_repository_json = 'checkout_information.json'
- def __init__(self, cwd, filesystem, **kwargs):
- # We create our own checkout root and filesystem here because we are working around the fact that we don't have and actual SCM scheme.
- self._filesystem = filesystem
- self.checkout_root = self.find_checkout_root(cwd)
+ def __init__(self, cwd, patch_directories=None, **kwargs):
+ SCM.__init__(self, cwd, **kwargs)
@classmethod
def _find_parent_path_matching_callback_condition(cls, path, callback, filesystem=None):
Modified: trunk/Tools/Scripts/webkitpy/common/checkout/scm/stub_repository_unittest.py (257795 => 257796)
--- trunk/Tools/Scripts/webkitpy/common/checkout/scm/stub_repository_unittest.py 2020-03-03 20:24:10 UTC (rev 257795)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/scm/stub_repository_unittest.py 2020-03-03 21:08:50 UTC (rev 257796)
@@ -22,7 +22,9 @@
import unittest
-from webkitpy.common.system import filesystem_mock
+from webkitpy.common.system.filesystem_mock import MockFileSystem
+from webkitpy.common.system.executive_mock import MockExecutive
+from webkitpy.common.host_mock import MockHost
from webkitpy.common.checkout.scm.stub_repository import StubRepository
mock_stub_repository_json = {'branch': 'trunk', 'id': '2738499'}
@@ -38,41 +40,43 @@
@staticmethod
def mock_host_for_stub_repository():
- host = filesystem_mock.MockFileSystem(files=FAKE_FILES)
+ host = MockHost(create_stub_repository_files=True)
+ host.filesystem = MockFileSystem(files=FAKE_FILES)
+ host.executive = MockExecutive()
return host
def test_in_working_directory(self):
host = StubRepositoryTest.mock_host_for_stub_repository()
- self.assertTrue(StubRepository.in_working_directory(path=host.join(host.getcwd(), 'TestDirectory', 'TestDirectory2', 'TestDirectory3'), filesystem=host))
+ self.assertTrue(StubRepository.in_working_directory(path=host.filesystem.join(host.filesystem.getcwd(), 'TestDirectory', 'TestDirectory2', 'TestDirectory3'), filesystem=host.filesystem))
def test_native_revision(self):
host = StubRepositoryTest.mock_host_for_stub_repository()
- repository = StubRepository(cwd=host.getcwd(), filesystem=host)
- self.assertEqual(repository.native_revision(path=host.join(host.getcwd(), 'TestDirectory', 'TestDirectory2', 'TestDirectory3')), mock_stub_repository_json['id'])
+ repository = StubRepository(cwd=host.filesystem.getcwd(), filesystem=host.filesystem, executive=host.executive)
+ self.assertEqual(repository.native_revision(path=host.filesystem.join(host.filesystem.getcwd(), 'TestDirectory', 'TestDirectory2', 'TestDirectory3')), mock_stub_repository_json['id'])
def test_native_branch(self):
host = StubRepositoryTest.mock_host_for_stub_repository()
- repository = StubRepository(cwd=host.getcwd(), filesystem=host)
- self.assertEqual(repository.native_branch(path=host.join(host.getcwd(), 'TestDirectory', 'TestDirectory2', 'TestDirectory3')), mock_stub_repository_json['branch'])
+ repository = StubRepository(cwd=host.filesystem.getcwd(), filesystem=host.filesystem, executive=host.executive)
+ self.assertEqual(repository.native_branch(path=host.filesystem.join(host.filesystem.getcwd(), 'TestDirectory', 'TestDirectory2', 'TestDirectory3')), mock_stub_repository_json['branch'])
def test_svn_revision(self):
host = StubRepositoryTest.mock_host_for_stub_repository()
- repository = StubRepository(cwd=host.getcwd(), filesystem=host)
- self.assertEqual(repository.svn_revision(path=host.join(host.getcwd(), 'TestDirectory', 'TestDirectory2', 'TestDirectory3')), mock_stub_repository_json['id'])
+ repository = StubRepository(cwd=host.filesystem.getcwd(), filesystem=host.filesystem, executive=host.executive)
+ self.assertEqual(repository.svn_revision(path=host.filesystem.join(host.filesystem.getcwd(), 'TestDirectory', 'TestDirectory2', 'TestDirectory3')), mock_stub_repository_json['id'])
def test_find_checkout_root(self):
host = StubRepositoryTest.mock_host_for_stub_repository()
- repository = StubRepository(cwd=host.getcwd(), filesystem=host)
- self.assertEquals(repository.find_checkout_root(path=host.join('TestDirectory', 'TestDirectory2', 'TestDirectory3')), host.join(host.getcwd(), 'TestDirectory', 'TestDirectory2'))
+ repository = StubRepository(cwd=host.filesystem.getcwd(), filesystem=host.filesystem, executive=host.executive)
+ self.assertEquals(repository.find_checkout_root(path=host.filesystem.join('TestDirectory', 'TestDirectory2', 'TestDirectory3')), host.filesystem.join(host.filesystem.getcwd(), 'TestDirectory', 'TestDirectory2'))
def test_find_checkout_root_failure(self):
host = StubRepositoryTest.mock_host_for_stub_repository()
- repository = StubRepository(cwd=host.getcwd(), filesystem=host)
- self.assertIsNone(repository.find_checkout_root(path=host.getcwd()))
+ repository = StubRepository(cwd=host.filesystem.getcwd(), filesystem=host.filesystem, executive=host.executive)
+ self.assertIsNone(repository.find_checkout_root(path=host.filesystem.getcwd()))
def test_find_parent_path_matching_callback_condition_with_file_system(self):
host = StubRepositoryTest.mock_host_for_stub_repository()
- self.assertIsNone(StubRepository._find_parent_path_matching_callback_condition(path=host.join('TestDirectory'), callback=lambda path: True, filesystem=host))
+ self.assertIsNone(StubRepository._find_parent_path_matching_callback_condition(path=host.filesystem.join('TestDirectory'), callback=lambda path: True, filesystem=host.filesystem))
def test_find_parent_path_matching_callback_condition_without_file_system(self):
self.assertIsNone(StubRepository._find_parent_path_matching_callback_condition(path='/Volumes/', callback=lambda path: True, filesystem=None))
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/models/test_run_results_unittest.py (257795 => 257796)
--- trunk/Tools/Scripts/webkitpy/layout_tests/models/test_run_results_unittest.py 2020-03-03 20:24:10 UTC (rev 257795)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/models/test_run_results_unittest.py 2020-03-03 21:08:50 UTC (rev 257796)
@@ -154,11 +154,16 @@
summary = summarized_results(self.port, expected=False, passing=False, flaky=False)
self.assertNotIn('revision', summary)
- def test_svn_revision(self):
+ def test_svn_revision_exists(self):
self.port._options.builder_name = 'dummy builder'
summary = summarized_results(self.port, expected=False, passing=False, flaky=False)
self.assertNotEquals(summary['revision'], '')
+ def test_svn_revision(self):
+ self.port._options.builder_name = 'dummy builder'
+ summary = summarized_results(self.port, expected=False, passing=False, flaky=False)
+ self.assertEquals(summary['revision'], '2738499')
+
def test_summarized_results_wontfix(self):
self.port._options.builder_name = 'dummy builder'
summary = summarized_results(self.port, expected=False, passing=False, flaky=False)
Modified: trunk/Tools/Scripts/webkitpy/port/base_unittest.py (257795 => 257796)
--- trunk/Tools/Scripts/webkitpy/port/base_unittest.py 2020-03-03 20:24:10 UTC (rev 257795)
+++ trunk/Tools/Scripts/webkitpy/port/base_unittest.py 2020-03-03 21:08:50 UTC (rev 257796)
@@ -36,6 +36,7 @@
from webkitpy.common.system.outputcapture import OutputCapture
from webkitpy.common.system.executive_mock import MockExecutive2
from webkitpy.common.system.systemhost_mock import MockSystemHost
+from webkitpy.common.host_mock import MockHost
from webkitpy.port import Port
from webkitpy.port.test import add_unit_tests_to_mock_filesystem, TestPort
@@ -46,7 +47,7 @@
class PortTest(unittest.TestCase):
def make_port(self, executive=None, with_tests=False, port_name=None, **kwargs):
- host = MockSystemHost()
+ host = MockHost(create_stub_repository_files=True)
if executive:
host.executive = executive
if with_tests:
@@ -435,7 +436,11 @@
port.reference_files('fast/ref.html'),
)
+ def test_commits_for_upload(self):
+ port = self.make_port(port_name='foo')
+ self.assertEqual([{'repository_id': 'webkit', 'id': '2738499', 'branch': 'trunk'}], port.commits_for_upload())
+
class NaturalCompareTest(unittest.TestCase):
def setUp(self):
self._port = TestPort(MockSystemHost())