Skip to content
Permalink
Browse files
test-webkitpy TestInstallGitLFS fails
https://bugs.webkit.org/show_bug.cgi?id=239788
<rdar://problem/92363359>

Reviewed by Michael Catanzaro.

* Tools/Scripts/libraries/webkitscmpy/setup.py: Bump version.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/install_git_lfs_unittest.py:
(TestInstallGitLFS.test_install): Specify mock system and machine.
(TestInstallGitLFS.test_configure): Ditto.
(TestInstallGitLFS.test_no_op): Ditto.
(TestInstallGitLFS.test_no_repo): Ditto.

Canonical link: https://commits.webkit.org/250046@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@293515 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
JonWBedard committed Apr 27, 2022
1 parent b191a69 commit becab7003e3c222a5b2d6de3f78af8283b3e9457
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 6 deletions.
@@ -1,3 +1,19 @@
2022-04-27 Jonathan Bedard <jbedard@apple.com>

test-webkitpy TestInstallGitLFS fails
https://bugs.webkit.org/show_bug.cgi?id=239788
<rdar://problem/92363359>

Reviewed by Michael Catanzaro.

* Scripts/libraries/webkitscmpy/setup.py: Bump version.
* Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
* Scripts/libraries/webkitscmpy/webkitscmpy/test/install_git_lfs_unittest.py:
(TestInstallGitLFS.test_install): Specify mock system and machine.
(TestInstallGitLFS.test_configure): Ditto.
(TestInstallGitLFS.test_no_op): Ditto.
(TestInstallGitLFS.test_no_repo): Ditto.

2022-04-27 Jonathan Bedard <jbedard@apple.com>

[commits.webkit.org] Change branch forwarding behavior
@@ -29,7 +29,7 @@ def readme():

setup(
name='webkitscmpy',
version='4.11.2',
version='4.11.3',
description='Library designed to interact with git and svn repositories.',
long_description=readme(),
classifiers=[
@@ -46,7 +46,7 @@ def _maybe_add_webkitcorepy_path():
"Please install webkitcorepy with `pip install webkitcorepy --extra-index-url <package index URL>`"
)

version = Version(4, 11, 2)
version = Version(4, 11, 3)

AutoInstall.register(Package('fasteners', Version(0, 15, 0)))
AutoInstall.register(Package('jinja2', Version(2, 11, 3)))
@@ -78,7 +78,7 @@ def test_install(self):
with OutputCapture() as captured, mocks.remote.GitHub('github.com/git-lfs/git-lfs', releases={
'v3.1.2/git-lfs-darwin-arm64-v3.1.2.zip': wkmocks.Response(status_code=200, content=self.ZIP_CONTENTS),
'v3.1.2/git-lfs-darwin-amd64-v3.1.2.zip': wkmocks.Response(status_code=200, content=self.ZIP_CONTENTS),
}), mocks.local.Git(self.path), mocks.local.Svn():
}), mocks.local.Git(self.path), mocks.local.Svn(), patch('platform.system', lambda: 'Darwin'), patch('platform.machine', lambda: 'x86_64'):
self.assertIsNone(local.Git(self.path).config().get('lfs.repositoryformatversion'))
self.assertEqual(0, program.main(
args=('install-git-lfs',),
@@ -97,7 +97,7 @@ def test_configure(self):
with OutputCapture() as captured, mocks.remote.GitHub('github.com/git-lfs/git-lfs', releases={
'v3.1.2/git-lfs-darwin-arm64-v3.1.2.zip': wkmocks.Response(status_code=200, content=self.ZIP_CONTENTS),
'v3.1.2/git-lfs-darwin-amd64-v3.1.2.zip': wkmocks.Response(status_code=200, content=self.ZIP_CONTENTS),
}), mocks.local.Git(self.path) as mocked, mocks.local.Svn():
}), mocks.local.Git(self.path) as mocked, mocks.local.Svn(), patch('platform.system', lambda: 'Darwin'), patch('platform.machine', lambda: 'x86_64'):
mocked.has_git_lfs = True

self.assertIsNone(local.Git(self.path).config().get('lfs.repositoryformatversion'))
@@ -117,7 +117,7 @@ def test_no_op(self):
with OutputCapture() as captured, mocks.remote.GitHub('github.com/git-lfs/git-lfs', releases={
'v3.1.2/git-lfs-darwin-arm64-v3.1.2.zip': wkmocks.Response(status_code=200, content=self.ZIP_CONTENTS),
'v3.1.2/git-lfs-darwin-amd64-v3.1.2.zip': wkmocks.Response(status_code=200, content=self.ZIP_CONTENTS),
}), mocks.local.Git(self.path) as mocked, mocks.local.Svn():
}), mocks.local.Git(self.path) as mocked, mocks.local.Svn(), patch('platform.system', lambda: 'Darwin'), patch('platform.machine', lambda: 'x86_64'):
mocked.has_git_lfs = True
mocked.edit_config('lfs.repositoryformatversion', '0')

@@ -137,7 +137,7 @@ def test_no_repo(self):
with OutputCapture() as captured, mocks.remote.GitHub('github.com/git-lfs/git-lfs', releases={
'v3.1.2/git-lfs-darwin-arm64-v3.1.2.zip': wkmocks.Response(status_code=200, content=self.ZIP_CONTENTS),
'v3.1.2/git-lfs-darwin-amd64-v3.1.2.zip': wkmocks.Response(status_code=200, content=self.ZIP_CONTENTS),
}), mocks.local.Git(), mocks.local.Svn():
}), mocks.local.Git(), mocks.local.Svn(), patch('platform.system', lambda: 'Darwin'), patch('platform.machine', lambda: 'x86_64'):
self.assertEqual(0, program.main(
args=('install-git-lfs',),
path=self.path,

0 comments on commit becab70

Please sign in to comment.