Title: [293515] trunk/Tools
Revision
293515
Author
[email protected]
Date
2022-04-27 10:15:53 -0700 (Wed, 27 Apr 2022)

Log Message

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

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (293514 => 293515)


--- trunk/Tools/ChangeLog	2022-04-27 17:12:06 UTC (rev 293514)
+++ trunk/Tools/ChangeLog	2022-04-27 17:15:53 UTC (rev 293515)
@@ -1,5 +1,21 @@
 2022-04-27  Jonathan Bedard  <[email protected]>
 
+        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  <[email protected]>
+
         [commits.webkit.org] Change branch forwarding behavior
         https://bugs.webkit.org/show_bug.cgi?id=239136
         <rdar://problem/91314217>

Modified: trunk/Tools/Scripts/libraries/webkitscmpy/setup.py (293514 => 293515)


--- trunk/Tools/Scripts/libraries/webkitscmpy/setup.py	2022-04-27 17:12:06 UTC (rev 293514)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/setup.py	2022-04-27 17:15:53 UTC (rev 293515)
@@ -29,7 +29,7 @@
 
 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=[

Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py (293514 => 293515)


--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py	2022-04-27 17:12:06 UTC (rev 293514)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py	2022-04-27 17:15:53 UTC (rev 293515)
@@ -46,7 +46,7 @@
         "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)))

Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/install_git_lfs_unittest.py (293514 => 293515)


--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/install_git_lfs_unittest.py	2022-04-27 17:12:06 UTC (rev 293514)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/install_git_lfs_unittest.py	2022-04-27 17:15:53 UTC (rev 293515)
@@ -78,7 +78,7 @@
         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 @@
         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 @@
         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 @@
         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,
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to