[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[dbates at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit d31982a24c7d2e170dfff7a039702cdf9fea2a69
Author: dbates at webkit.org <dbates at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 30 06:29:24 2009 +0000

    2009-12-29  Daniel Bates  <dbates at webkit.org>
    
            Reviewed by Eric Seidel.
    
            https://bugs.webkit.org/show_bug.cgi?id=33041
    
            Speed up the test method test_read_credentials_with_SVN by not actually
            creating an SVN repository to test against (by default). Instead, it is
            sufficient to create a temporary directory that does not contain a Git
            repository.
    
            Also, renamed method test_read_credentials_with_SVN to
            test_read_credentials_without_git_repo, to better reflect what it is
            testing.
    
            * Scripts/modules/credentials_unittest.py:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52644 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 4042655..5bfceaf 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,5 +1,22 @@
 2009-12-29  Daniel Bates  <dbates at webkit.org>
 
+        Reviewed by Eric Seidel.
+
+        https://bugs.webkit.org/show_bug.cgi?id=33041
+
+        Speed up the test method test_read_credentials_with_SVN by not actually
+        creating an SVN repository to test against (by default). Instead, it is
+        sufficient to create a temporary directory that does not contain a Git
+        repository.
+
+        Also, renamed method test_read_credentials_with_SVN to
+        test_read_credentials_without_git_repo, to better reflect what it is
+        testing.
+
+        * Scripts/modules/credentials_unittest.py:
+
+2009-12-29  Daniel Bates  <dbates at webkit.org>
+
         Reviewed by Adam Barth.
 
         https://bugs.webkit.org/show_bug.cgi?id=33039
diff --git a/WebKitTools/Scripts/modules/credentials_unittest.py b/WebKitTools/Scripts/modules/credentials_unittest.py
index 6736d0e..0e82932 100644
--- a/WebKitTools/Scripts/modules/credentials_unittest.py
+++ b/WebKitTools/Scripts/modules/credentials_unittest.py
@@ -26,11 +26,12 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import os
+import tempfile
 import unittest
 from modules.credentials import Credentials
 from modules.executive import Executive
 from modules.outputcapture import OutputCapture
-from modules.scm_unittest import SVNTestRepository
 from modules.mock import Mock
 
 class CredentialsTest(unittest.TestCase):
@@ -102,20 +103,17 @@ password: "SECRETSAUCE"
         credentials._read_git_config("foo")
         executive_mock.run_command.assert_called_with(["git", "config", "--get", "test_prefix.foo"], error_handler=Executive.ignore_error)
 
-    def test_read_credentials_with_SVN(self):
-        # Note, this test assumes that SVN is installed as listed on 
-        # <http://webkit.org/building/tools.html> as of 12/27/2009.
-
+    def test_read_credentials_without_git_repo(self):
         class FakeCredentials(Credentials):
             def _is_mac_os_x(self):
                 return True
             def _credentials_from_keychain(self, username):
                 return ["test at webkit.org", "SECRETSAUCE"]
 
-        SVNTestRepository.setup(self)
-        credentials = FakeCredentials("bugs.webkit.org", cwd=self.svn_checkout_path)
+        temp_dir_path = tempfile.mkdtemp(suffix="not_a_git_repo")
+        credentials = FakeCredentials("bugs.webkit.org", cwd=temp_dir_path)
         self.assertEqual(credentials.read_credentials(), ["test at webkit.org", "SECRETSAUCE"])
-        SVNTestRepository.tear_down(self)
+        os.rmdir(temp_dir_path)
 
 if __name__ == '__main__':
     unittest.main()

-- 
WebKit Debian packaging