Title: [185064] trunk/Tools
- Revision
- 185064
- Author
- [email protected]
- Date
- 2015-06-01 11:00:05 -0700 (Mon, 01 Jun 2015)
Log Message
Fix the webkitpy scm unittests after r174051
https://bugs.webkit.org/show_bug.cgi?id=145511
Reviewed by Darin Adler.
* Scripts/webkitpy/common/checkout/scm/scm_unittest.py:
(GitTestWithMock.make_scm):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (185063 => 185064)
--- trunk/Tools/ChangeLog 2015-06-01 17:57:18 UTC (rev 185063)
+++ trunk/Tools/ChangeLog 2015-06-01 18:00:05 UTC (rev 185064)
@@ -1,5 +1,15 @@
2015-06-01 Csaba Osztrogonác <[email protected]>
+ Fix the webkitpy scm unittests after r174051
+ https://bugs.webkit.org/show_bug.cgi?id=145511
+
+ Reviewed by Darin Adler.
+
+ * Scripts/webkitpy/common/checkout/scm/scm_unittest.py:
+ (GitTestWithMock.make_scm):
+
+2015-06-01 Csaba Osztrogonác <[email protected]>
+
EWS provides misleading information for not applyable patches
https://bugs.webkit.org/show_bug.cgi?id=145307
Modified: trunk/Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py (185063 => 185064)
--- trunk/Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py 2015-06-01 17:57:18 UTC (rev 185063)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py 2015-06-01 18:00:05 UTC (rev 185064)
@@ -1560,7 +1560,7 @@
def make_scm(self, logging_executive=False):
# We do this should_log dance to avoid logging when Git.__init__ runs sysctl on mac to check for 64-bit support.
- scm = Git(cwd=".", executive=MockExecutive(), filesystem=MockFileSystem())
+ scm = Git(cwd=".", patch_directories=None, executive=MockExecutive(), filesystem=MockFileSystem())
scm.read_git_config = lambda *args, **kw: "MOCKKEY:MOCKVALUE"
scm._executive._should_log = logging_executive
return scm
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes