Fix credentials handling for dump tool (issue 223).

kxepal · kxepal · commit 02af2031d58b · 2013-04-25T09:47:06.000+02:00
diff --git a/couchdb/tests/tools.py b/couchdb/tests/tools.py
@@ -11,9 +11,11 @@
 import unittest
 from StringIO import StringIO
 
-from couchdb.tools import load
+from couchdb import Unauthorized
+from couchdb.tools import load, dump
 from couchdb.tests import testutil
 
+
 class ToolLoadTestCase(testutil.TempDatabaseMixin, unittest.TestCase):
 
     def test_handle_credentials(self):
@@ -22,6 +24,18 @@ def test_handle_credentials(self):
         load.load_db(StringIO(''), self.db.resource.url, 'foo', 'bar')
 
 
+class ToolDumpTestCase(testutil.TempDatabaseMixin, unittest.TestCase):
+
+    def test_handle_credentials(self):
+        # Similar to issue 194
+        # Fixing: AttributeError: 'Resource' object has no attribute 'http'
+        try:
+            dump.dump_db(self.db.resource.url, 'foo', 'bar', output=StringIO())
+        except Unauthorized:
+            # This is ok, since we provided dummy credentials.
+            pass
+
+
 def suite():
     suite = unittest.TestSuite()
     suite.addTest(unittest.makeSuite(ToolLoadTestCase, 'test'))
diff --git a/couchdb/tools/dump.py b/couchdb/tools/dump.py
@@ -25,7 +25,7 @@ def dump_db(dburl, username=None, password=None, boundary=None,
             output=sys.stdout):
     db = Database(dburl)
     if username is not None and password is not None:
-        db.resource.http.add_credentials(username, password)
+        db.resource.credentials = username, password
 
     envelope = write_multipart(output, boundary=boundary)
     for docid in db:
