Modified: trunk/Tools/ChangeLog (126951 => 126952)
--- trunk/Tools/ChangeLog 2012-08-29 02:36:46 UTC (rev 126951)
+++ trunk/Tools/ChangeLog 2012-08-29 03:09:35 UTC (rev 126952)
@@ -1,3 +1,18 @@
+2012-08-28 Eric Seidel <[email protected]>
+
+ cr-ews bot doesn't set CWD correctly when zipping layout test results
+ https://bugs.webkit.org/show_bug.cgi?id=91265
+
+ Reviewed by Kenneth Russell.
+
+ This should make the zips slightly less cumbersome to deal with.
+
+ * Scripts/webkitpy/common/system/workspace.py:
+ (Workspace.create_zip):
+ * Scripts/webkitpy/common/system/workspace_unittest.py:
+ (WorkspaceTest.test_create_zip):
+ (WorkspaceTest.test_create_zip_exception):
+
2012-08-28 Benjamin Poulain <[email protected]>
Fix the Commiters script
Modified: trunk/Tools/Scripts/webkitpy/common/system/workspace.py (126951 => 126952)
--- trunk/Tools/Scripts/webkitpy/common/system/workspace.py 2012-08-29 02:36:46 UTC (rev 126951)
+++ trunk/Tools/Scripts/webkitpy/common/system/workspace.py 2012-08-29 03:09:35 UTC (rev 126952)
@@ -65,7 +65,7 @@
# However, getting the paths, encoding and compression correct could be non-trivial.
# So, for now we depend on the environment having "zip" installed (likely fails on Win32)
try:
- self._executive.run_command(['zip', '-9', '-r', zip_path, source_path])
+ self._executive.run_command(['zip', '-9', '-r', zip_path, '.'], cwd=source_path)
except ScriptError, e:
_log.error("Workspace.create_zip failed:\n%s" % e.message_with_output())
return None
Modified: trunk/Tools/Scripts/webkitpy/common/system/workspace_unittest.py (126951 => 126952)
--- trunk/Tools/Scripts/webkitpy/common/system/workspace_unittest.py 2012-08-29 02:36:46 UTC (rev 126951)
+++ trunk/Tools/Scripts/webkitpy/common/system/workspace_unittest.py 2012-08-29 03:09:35 UTC (rev 126952)
@@ -50,7 +50,7 @@
def test_create_zip(self):
workspace = Workspace(None, MockExecutive(should_log=True))
- expected_stderr = "MOCK run_command: ['zip', '-9', '-r', '/zip/path', '/source/path'], cwd=None\n"
+ expected_stderr = "MOCK run_command: ['zip', '-9', '-r', '/zip/path', '.'], cwd=/source/path\n"
class MockZipFile(object):
def __init__(self, path):
self.filename = path
@@ -59,7 +59,7 @@
def test_create_zip_exception(self):
workspace = Workspace(None, MockExecutive(should_log=True, should_throw=True))
- expected_stderr = "MOCK run_command: ['zip', '-9', '-r', '/zip/path', '/source/path'], cwd=None\n"
+ expected_stderr = "MOCK run_command: ['zip', '-9', '-r', '/zip/path', '.'], cwd=/source/path\n"
class MockZipFile(object):
def __init__(self, path):
self.filename = path
