[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.16-1409-g5afdf4d
hamaji at chromium.org
hamaji at chromium.org
Thu Dec 3 13:40:00 UTC 2009
The following commit has been merged in the webkit-1.1 branch:
commit 5d706a76b4f0cfbdcf7ea5278adc5ad70ba6052d
Author: hamaji at chromium.org <hamaji at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Nov 19 05:47:27 2009 +0000
2009-11-18 Shinichiro Hamaji <hamaji at chromium.org>
Reviewed by Eric Seidel.
GitTest.test_create_binary_patch fails if /tmp is symlink
https://bugs.webkit.org/show_bug.cgi?id=31536
* Scripts/modules/scm_unittest.py:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51173 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index ad43b32..33991f4 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,12 @@
+2009-11-18 Shinichiro Hamaji <hamaji at chromium.org>
+
+ Reviewed by Eric Seidel.
+
+ GitTest.test_create_binary_patch fails if /tmp is symlink
+ https://bugs.webkit.org/show_bug.cgi?id=31536
+
+ * Scripts/modules/scm_unittest.py:
+
2009-11-18 Yaar Schnitman <yaar at chromium.org>
Reviewed by Darin Adler.
diff --git a/WebKitTools/Scripts/modules/scm_unittest.py b/WebKitTools/Scripts/modules/scm_unittest.py
index 25d96c2..577918b 100644
--- a/WebKitTools/Scripts/modules/scm_unittest.py
+++ b/WebKitTools/Scripts/modules/scm_unittest.py
@@ -563,23 +563,24 @@ class GitTest(SCMTest):
def test_create_binary_patch(self):
# Create a git binary patch and check the contents.
scm = detect_scm_system(self.git_checkout_path)
- test_file_path = os.path.join(self.git_checkout_path, 'binary_file')
+ test_file_name = 'binary_file'
+ test_file_path = os.path.join(self.git_checkout_path, test_file_name)
file_contents = ''.join(map(chr, range(256)))
write_into_file_at_path(test_file_path, file_contents)
- run(['git', 'add', test_file_path])
+ run(['git', 'add', test_file_name])
patch = scm.create_patch()
self.assertTrue(re.search(r'\nliteral 0\n', patch))
self.assertTrue(re.search(r'\nliteral 256\n', patch))
# Check if we can apply the created patch.
- run(['git', 'rm', '-f', test_file_path])
+ run(['git', 'rm', '-f', test_file_name])
self._setup_webkittools_scripts_symlink(scm)
self.scm.apply_patch(self._create_patch(patch))
self.assertEqual(file_contents, read_from_path(test_file_path))
# Check if we can create a patch from a local commit.
write_into_file_at_path(test_file_path, file_contents)
- run(['git', 'add', test_file_path])
+ run(['git', 'add', test_file_name])
run(['git', 'commit', '-m', 'binary diff'])
patch_from_local_commit = scm.create_patch_from_local_commit('HEAD')
self.assertTrue(re.search(r'\nliteral 0\n', patch_from_local_commit))
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list