Fix tests to run against non-standard server URL.

atomatt · atomatt · commit 834936aebffd · 2010-07-16T12:20:12.000+01:00
diff --git a/couchdb/client.py b/couchdb/client.py
@@ -8,7 +8,7 @@
 
 """Python client API for CouchDB.
 
->>> server = Server('http://localhost:5984/')
+>>> server = Server()
 >>> db = server.create('python-tests')
 >>> doc_id, doc_rev = db.save({'type': 'Person', 'name': 'John Doe'})
 >>> doc = db[doc_id]
@@ -43,7 +43,7 @@
 class Server(object):
     """Representation of a CouchDB server.
 
-    >>> server = Server('http://localhost:5984/')
+    >>> server = Server()
 
     This class behaves like a dictionary of databases. For example, to get a
     list of database names on the server, you can simply iterate over the
@@ -218,7 +218,7 @@ def replicate(self, source, target, **options):
 class Database(object):
     """Representation of a database on a CouchDB server.
 
-    >>> server = Server('http://localhost:5984/')
+    >>> server = Server()
     >>> db = server.create('python-tests')
 
     New documents can be added to the database using the `save()` method:
@@ -486,7 +486,7 @@ def delete(self, doc):
         the document has been updated since it was retrieved, this method will
         raise a `ResourceConflict` exception.
 
-        >>> server = Server('http://localhost:5984/')
+        >>> server = Server()
         >>> db = server.create('python-tests')
 
         >>> doc = dict(type='Person', name='John Doe')
@@ -640,7 +640,7 @@ def query(self, map_fun, reduce_fun=None, language='javascript',
               wrapper=None, **options):
         """Execute an ad-hoc query (a "temp view") against the database.
 
-        >>> server = Server('http://localhost:5984/')
+        >>> server = Server()
         >>> db = server.create('python-tests')
         >>> db['johndoe'] = dict(type='Person', name='John Doe')
         >>> db['maryjane'] = dict(type='Person', name='Mary Jane')
@@ -683,7 +683,7 @@ def update(self, documents, **options):
         """Perform a bulk update or insertion of the given documents using a
         single HTTP request.
 
-        >>> server = Server('http://localhost:5984/')
+        >>> server = Server()
         >>> db = server.create('python-tests')
         >>> for doc in db.update([
         ...     Document(type='Person', name='John Doe'),
@@ -751,7 +751,7 @@ def update(self, documents, **options):
     def view(self, name, wrapper=None, **options):
         """Execute a predefined view.
 
-        >>> server = Server('http://localhost:5984/')
+        >>> server = Server()
         >>> db = server.create('python-tests')
         >>> db['gotham'] = dict(type='City', name='Gotham City')
 
@@ -920,7 +920,7 @@ class ViewResults(object):
     This class allows the specification of ``key``, ``startkey``, and
     ``endkey`` options using Python slice notation.
 
-    >>> server = Server('http://localhost:5984/')
+    >>> server = Server()
     >>> db = server.create('python-tests')
     >>> db['johndoe'] = dict(type='Person', name='John Doe')
     >>> db['maryjane'] = dict(type='Person', name='Mary Jane')
diff --git a/couchdb/design.py b/couchdb/design.py
@@ -27,7 +27,7 @@ class ViewDefinition(object):
     with the definition in the application code.
     
     >>> from couchdb import Server
-    >>> server = Server('http://localhost:5984/')
+    >>> server = Server()
     >>> db = server.create('python-tests')
     
     >>> view = ViewDefinition('tests', 'all', '''function(doc) {
diff --git a/couchdb/mapping.py b/couchdb/mapping.py
@@ -9,7 +9,7 @@
 """Mapping from raw JSON data structures to Python objects and vice versa.
 
 >>> from couchdb import Server
->>> server = Server('http://localhost:5984/')
+>>> server = Server()
 >>> db = server.create('python-tests')
 
 To define a document mapping, you declare a Python class inherited from
@@ -206,7 +206,7 @@ class ViewField(object):
     That property can be used as a function, which will execute the view.
     
     >>> from couchdb import Database
-    >>> db = Database('http://localhost:5984/python-tests')
+    >>> db = Database('python-tests')
     
     >>> Person.by_name(db, count=3)
     <ViewResults <PermanentView '_design/people/_view/by_name'> {'count': 3}>
@@ -527,7 +527,7 @@ class DictField(Field):
     """Field type for nested dictionaries.
     
     >>> from couchdb import Server
-    >>> server = Server('http://localhost:5984/')
+    >>> server = Server()
     >>> db = server.create('python-tests')
 
     >>> class Post(Document):
@@ -580,7 +580,7 @@ class ListField(Field):
     """Field type for sequences of other fields.
 
     >>> from couchdb import Server
-    >>> server = Server('http://localhost:5984/')
+    >>> server = Server()
     >>> db = server.create('python-tests')
 
     >>> class Post(Document):
diff --git a/couchdb/tests/client.py b/couchdb/tests/client.py
@@ -15,6 +15,7 @@
 import tempfile
 import threading
 import unittest
+import urlparse
 
 from couchdb import client, http
 from couchdb.tests import testutil
@@ -442,7 +443,8 @@ def test_changes_releases_conn(self):
         # Consume an entire changes feed to read the whole response, then check
         # that the HTTP connection made it to the pool.
         list(self.db.changes(feed='continuous', timeout=0))
-        self.assertTrue(self.db.resource.session.conns[('http', 'localhost:5984')])
+        scheme, netloc = urlparse.urlsplit(client.DEFAULT_BASE_URL)[:2]
+        self.assertTrue(self.db.resource.session.conns[(scheme, netloc)])
 
     def test_changes_releases_conn_when_lastseq(self):
         # Consume a changes feed, stopping at the 'last_seq' item, i.e. don't
@@ -451,7 +453,8 @@ def test_changes_releases_conn_when_lastseq(self):
         for obj in self.db.changes(feed='continuous', timeout=0):
             if 'last_seq' in obj:
                 break
-        self.assertTrue(self.db.resource.session.conns[('http', 'localhost:5984')])
+        scheme, netloc = urlparse.urlsplit(client.DEFAULT_BASE_URL)[:2]
+        self.assertTrue(self.db.resource.session.conns[(scheme, netloc)])
 
     def test_changes_conn_usable(self):
         # Consume a changes feed to get a used connection in the pool.
diff --git a/couchdb/tests/testutil.py b/couchdb/tests/testutil.py
@@ -6,7 +6,6 @@
 # This software is licensed as described in the file COPYING, which
 # you should have received as part of this distribution.
 
-import os
 import uuid
 from couchdb import client
 
