Diff
Modified: trunk/Tools/ChangeLog (268878 => 268879)
--- trunk/Tools/ChangeLog 2020-10-22 18:36:38 UTC (rev 268878)
+++ trunk/Tools/ChangeLog 2020-10-22 18:47:56 UTC (rev 268879)
@@ -1,3 +1,18 @@
+2020-10-22 Jonathan Bedard <[email protected]>
+
+ Few webkitpy tests fail for machines in non-PST timezones
+ https://bugs.webkit.org/show_bug.cgi?id=218079
+ <rdar://problem/70579517>
+
+ Reviewed by Aakash Jain.
+
+ * Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Bump version.
+ * Scripts/libraries/webkitscmpy/webkitscmpy/test/find_unittest.py:
+ * Scripts/libraries/webkitscmpy/webkitscmpy/test/git_unittest.py:
+ (TestGit.test_info):
+ * Scripts/libraries/webkitscmpy/webkitscmpy/test/svn_unittest.py:
+ (TestSvn.test_info):
+
2020-10-22 Eric Carlson <[email protected]>
UIClient isn't notified when page muted state changes
Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py (268878 => 268879)
--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py 2020-10-22 18:36:38 UTC (rev 268878)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py 2020-10-22 18:47:56 UTC (rev 268879)
@@ -46,7 +46,7 @@
"Please install webkitcorepy with `pip install webkitcorepy --extra-index-url <package index URL>`"
)
-version = Version(0, 2, 2)
+version = Version(0, 2, 3)
AutoInstall.register(Package('dateutil', Version(2, 8, 1), pypi_name='python-dateutil'))
Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/find_unittest.py (268878 => 268879)
--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/find_unittest.py 2020-10-22 18:36:38 UTC (rev 268878)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/find_unittest.py 2020-10-22 18:47:56 UTC (rev 268879)
@@ -23,9 +23,10 @@
import json
import unittest
+from datetime import datetime
from webkitcorepy import OutputCapture
from webkitcorepy.mocks import Time as MockTime
-from webkitscmpy import local, program, mocks
+from webkitscmpy import program, mocks
class TestFind(unittest.TestCase):
@@ -122,10 +123,10 @@
'''Title: 4th commit
Author: Jonathan Bedard <[email protected]>
Identifier: 3@main
-Date: Fri Oct 02 11:23:20 2020
+Date: {}
Revision: 4
Hash: 1abe25b443e9
-''',
+'''.format(datetime.fromtimestamp(1601663000).strftime('%a %b %d %H:%M:%S %Y')),
)
def test_verbose(self):
@@ -139,12 +140,12 @@
'''Title: 4th commit
Author: Jonathan Bedard <[email protected]>
Identifier: 3@main
-Date: Fri Oct 02 11:23:20 2020
+Date: {}
Revision: 4
Hash: 1abe25b443e9
4th commit
svn-id: https://svn.webkit.orgrepository/repository/trunk@4 268f45cc-cd09-0410-ab3c-d52691b4dbfc
-''',
+'''.format(datetime.fromtimestamp(1601663000).strftime('%a %b %d %H:%M:%S %Y')),
)
def test_json(self):
Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/git_unittest.py (268878 => 268879)
--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/git_unittest.py 2020-10-22 18:36:38 UTC (rev 268878)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/git_unittest.py 2020-10-22 18:47:56 UTC (rev 268879)
@@ -23,6 +23,7 @@
import os
import unittest
+from datetime import datetime
from webkitcorepy import LoggerCapture
from webkitcorepy.mocks import Time as MockTime
from webkitscmpy import local, mocks
@@ -97,7 +98,7 @@
'Schedule': 'normal',
'Last Changed Author': '[email protected]',
'Last Changed Rev': '6',
- 'Last Changed Date': '2020-10-02 11:56:40',
+ 'Last Changed Date': datetime.fromtimestamp(1601665000).strftime('%Y-%m-%d %H:%M:%S'),
}, local.Git(self.path).info(),
)
Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/svn_unittest.py (268878 => 268879)
--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/svn_unittest.py 2020-10-22 18:36:38 UTC (rev 268878)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/svn_unittest.py 2020-10-22 18:47:56 UTC (rev 268879)
@@ -25,6 +25,7 @@
import tempfile
import unittest
+from datetime import datetime
from webkitcorepy import OutputCapture
from webkitscmpy import local, mocks
@@ -89,7 +90,7 @@
u'Schedule': u'normal',
u'Last Changed Author': u'[email protected]',
u'Last Changed Rev': u'6',
- u'Last Changed Date': u'2020-10-02 11:58:20 -0100 (Fri, 02 Oct 2020)',
+ u'Last Changed Date': datetime.fromtimestamp(1601665100).strftime('%Y-%m-%d %H:%M:%S -0100 (%a, %d %b %Y)'),
}, local.Svn(self.path).info(),
)
