[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[dpranke at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 1b616f772c5f5a1cd40a5266a9b8e2a9a704b410
Author: dpranke at chromium.org <dpranke at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 5 06:39:23 2010 +0000

    2010-10-04  Dirk Pranke  <dpranke at chromium.org>
    
            Unreviewed, build fix.
    
            r69065 broke test-webkitpy by trying to create a '/tmp-X' directory,
            which can't always be done. This test uses tempfile.mkdtemp(), which
            should be safe.
    
            * Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69085 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index f8a5975..308f223 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -2,6 +2,16 @@
 
         Unreviewed, build fix.
 
+        r69065 broke test-webkitpy by trying to create a '/tmp-X' directory,
+        which can't always be done. This test uses tempfile.mkdtemp(), which
+        should be safe.
+
+        * Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py:
+
+2010-10-04  Dirk Pranke  <dpranke at chromium.org>
+
+        Unreviewed, build fix.
+
         Add missing "from __future__ import with_statement" that was
         breaking test-webkitpy on the Leopard bots (broke in r69040).
 
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py b/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py
index 8bb90e8..11b77db 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py
@@ -34,6 +34,7 @@ import codecs
 import logging
 import os
 import Queue
+import shutil
 import sys
 import tempfile
 import thread
@@ -237,9 +238,11 @@ class MainTest(unittest.TestCase):
         # We run a configuration that should fail, to generate output, then
         # look for what the output results url was.
 
-        res, out, err, user = logging_run(['--results-directory=/tmp-results'],
+        tmpdir = tempfile.mkdtemp()
+        res, out, err, user = logging_run(['--results-directory=' + tmpdir],
                                           tests_included=True)
-        self.assertEqual(user.url, '/tmp-results/results.html')
+        self.assertEqual(user.url, os.path.join(tmpdir, 'results.html'))
+        shutil.rmtree(tmpdir, ignore_errors=True)
 
     def test_results_directory_default(self):
         # We run a configuration that should fail, to generate output, then

-- 
WebKit Debian packaging