Changeset 89209 in webkit

Timestamp:

Jun 18, 2011 6:55:24 PM (13 years ago)

Author:

dbates@webkit.org

Message:

2011-06-18 Daniel Bates <​dbates@webkit.org>

Reviewed by Eric Seidel.

Git.push_local_commits_to_server should use password username and
password when we don't have cached credentials
​https://bugs.webkit.org/show_bug.cgi?id=62941

Fixes a issue where Git.push_local_commits_to_server() would always look
for cached credentials regardless of whether a username and password
were passed as arguments. Instead, if given both a username and password
then we shouldn't look for cached credentials (since we were explicitly given
credentials).

• Scripts/webkitpy/common/checkout/scm/git.py:
• Scripts/webkitpy/common/checkout/scm/scm_unittest.py: Added unit tests.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/checkout/scm/git.py (modified) (1 diff)
• Scripts/webkitpy/common/checkout/scm/scm_unittest.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-06-18  Daniel Bates  <dbates@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        Git.push_local_commits_to_server should use password username and
+        password when we don't have cached credentials
+        https://bugs.webkit.org/show_bug.cgi?id=62941
+
+        Fixes a issue where Git.push_local_commits_to_server() would always look
+        for cached credentials regardless of whether a username and password
+        were passed as arguments. Instead, if given both a username and password
+        then we shouldn't look for cached credentials (since we were explicitly given
+        credentials).
+
+        * Scripts/webkitpy/common/checkout/scm/git.py:
+        * Scripts/webkitpy/common/checkout/scm/scm_unittest.py: Added unit tests.
+
 2011-06-18  Daniel Bates  <dbates@rim.com>
 

trunk/Tools/Scripts/webkitpy/common/checkout/scm/git.py

@@ -401 +401 @@
         if self.dryrun:
             dcommit_command.append('--dry-run')
-        if not self.has_authorization_for_realm(SVN.svn_server_realm):
+        if (not username or not password) and not self.has_authorization_for_realm(SVN.svn_server_realm):
             raise AuthenticationError(SVN.svn_server_host, prompt_for_password=True)
         if username:

trunk/Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py

@@ -1459 +1459 @@
         OutputCapture().assert_outputs(self, self.scm.create_patch, kwargs={'changed_files': None}, expected_stderr=expected_stderr)
 
+    def test_push_local_commits_to_server_with_username_and_password(self):
+        self.assertEquals(self.scm.push_local_commits_to_server(username='dbates@webkit.org', password='blah'), "MOCK output of child process")
+
+    def test_push_local_commits_to_server_without_username_and_password(self):
+        self.assertRaises(AuthenticationError, self.scm.push_local_commits_to_server)
+
+    def test_push_local_commits_to_server_with_username_and_without_password(self):
+        self.assertRaises(AuthenticationError, self.scm.push_local_commits_to_server, {'username': 'dbates@webkit.org'})
+
+    def test_push_local_commits_to_server_without_username_and_with_password(self):
+        self.assertRaises(AuthenticationError, self.scm.push_local_commits_to_server, {'password': 'blah'})
 
 if __name__ == '__main__':