Merge lp:~terrycojones/txfluiddb/perms-Dec-2009 into lp:txfluiddb

[Terry Jones]

[Terry Jones (terrycojones)]

Add getting/setting perms on namespaces, tags, and sets of tag values.

[Tristan Seligmann (mithrandi)]

> 36 + components.extend([collectionName or self.collectionName] +
> 37 + self.components)

I'd write this as:

components.append(collectionName or self.collectionName)
components.extend(self.components)

We're supposed to be applying the Twisted coding standard; could you ensure all of the code you changed has three empty lines between classes, and two empty lines between functions / methods? There are various places that look like they need some additional empty lines, while class TagValueTests seems to have an extra empty line before it.

There are two pyflakes warnings, one of which was probably introduced in your previous branch, but I only noticed now:

http.py:11: 'log' imported but unused
test/test_client.py:7: 'TagValues' imported but unused

Aside from those issues, this all looks good; I like the test coverage, and I assume the semantics are correct given who wrote the code ;)

review: Needs Fixing

[lp:~terrycojones/txfluiddb/perms-Dec-2009]

8. By Terry Jones on 2010-01-17

Cleanup following Tristan review: consistent whitespace between classes and methods/funcs, pyflakes warnings fixed, clearer/simple treatment of path in _HasPath.getURL

=== modified file 'txfluiddb/client.py'
--- txfluiddb/client.py	2010-01-17 11:25:03 +0000
+++ txfluiddb/client.py	2010-01-17 19:12:17 +0000
@@ -9,6 +9,7 @@
 from txfluiddb.http import getPage
 
 
+
 class _HasPath(object):
     """
     Base class for FluidDB identifiers composed of path components.
@@ -68,7 +69,7 @@
         return u'/'.join(self.components)
 
 
-    def getURL(self, endpoint, prefix=None, suffix=[]):
+    def getURL(self, endpoint, prefix=None, suffix=None, collectionName=None):
         """
         Get the URL for this path as accessed through the given endpoint.
 
@@ -81,6 +82,9 @@
         @type  suffix: C{list} of C{unicode}
         @param suffix: A list of components to append after this path.
 
+        @type  collectionName: C{unicode}
+        @param suffix: A collectionName to use instead of self.collectionName.
+
         @rtype: C{str}
         """
         if self.collectionName is None:
@@ -88,22 +92,41 @@
                 'Must override collectionName on _HasPath subclasses')
 
         components = []
-        if prefix is None:
-            components.append(self.collectionName)
-        else:
+        if prefix:
             components.extend(prefix)
-            # Should self.collectionName be appended here? Or is a passed
-            # prefix supposed to take the place of the collection name?
+        components.append(collectionName or self.collectionName)
         components.extend(self.components)
-        components.extend(suffix)
+        if suffix:
+            components.extend(suffix)
 
         components = [quote(component.encode('utf-8'), safe='')
                       for component in components]
         return endpoint.getRootURL() + '/'.join(components)
 
 
-
-class Namespace(_HasPath):
+class _HasPerms(object):
+    """
+    Mixin base class for FluidDB elements that have permissions.
+    """
+
+
+    def getPerms(self, endpoint, action):
+        url = self.getURL(endpoint,
+                          prefix=[u'permissions']) + '?action=%s' % action
+        d = endpoint.submit(url=url, method='GET')
+        return d.addCallback(lambda res: (res[u'policy'], res[u'exceptions']))
+
+
+    def setPerms(self, endpoint, action, policy, exceptions):
+        return endpoint.submit(
+            url=self.getURL(endpoint,
+                            prefix=[u'permissions']) + '?action=%s' % action,
+            method='PUT',
+            data={u'policy' : policy, u'exceptions' : exceptions })
+
+
+
+class Namespace(_HasPath, _HasPerms):
     """
     Representation of a FluidDB namespace.
     """
@@ -141,6 +164,21 @@
         return Tag(*path)
 
 
+    def tagValues(self, name):
+        """
+        Get the tag values.
+
+        @type  name: C{unicode}
+        @param name: The name of the tag.
+
+        @rtype:  L{Tag}
+        @return: A TagValues object for the tag with the given name.
+        """
+        path = list(self.components)
+        path.append(name)
+        return TagValues(*path)
+
+
     def getDescription(self, endpoint):
         """
         Get a description of the namespace.
@@ -258,7 +296,7 @@
         @return: The newly-created tag.
         """
         self.checkComponent(name)
-        return endpoint.submit(url=self.getURL(endpoint, ['tags']),
+        return endpoint.submit(url=self.getURL(endpoint, collectionName='tags'),
                                method='POST',
                                data={u'name': name,
                                      u'description': description,
@@ -279,7 +317,7 @@
 
 
 
-class Tag(_HasPath):
+class Tag(_HasPath, _HasPerms):
     """
     Representation of a FluidDB tag.
     """
@@ -332,6 +370,14 @@
 
 
 
+class TagValues(_HasPath, _HasPerms):
+    """
+    Representation of the set of values of a tag.
+    """
+    collectionName = u'tag-values'
+
+
+
 class BasicCreds(object):
     """
     Credentials for HTTP Basic Authentication.
@@ -346,6 +392,7 @@
         self.username = username
         self.password = password
 
+
     def encode(self):
         """
         Encode these credentials.
@@ -362,6 +409,7 @@
 PRIMITIVE_CONTENT_TYPE = 'application/vnd.fluiddb.value+json'
 
 
+
 class Endpoint(object):
     """
     A FluidDB endpoint.
@@ -505,6 +553,7 @@
         return d.addCallback(_parse)
 
 
+
 class Object(_HasPath):
     """
     A FluidDB object.
 
=== modified file 'txfluiddb/http.py'
--- txfluiddb/http.py	2010-01-17 11:25:03 +0000
+++ txfluiddb/http.py	2010-01-17 19:12:17 +0000
@@ -8,10 +8,10 @@
 FluidDB returns a 204 in various cases."""
 
 from twisted.internet import reactor
-from twisted.python import log
 from twisted.web import client, error
 
 
+
 class HTTPError(error.Error):
     def __init__(self, code, message=None, response=None,
                  response_headers=None):
@@ -19,10 +19,12 @@
         self.response_headers = response_headers
 
 
+
 class HTTPPageGetter(client.HTTPPageGetter):
     handleStatus_204 = lambda self: self.handleStatus_200()
 
 
+
 class HTTPClientFactory(client.HTTPClientFactory):
     protocol = HTTPPageGetter
         
 
=== modified file 'txfluiddb/test/test_client.py'
--- txfluiddb/test/test_client.py	2009-10-18 01:44:44 +0000
+++ txfluiddb/test/test_client.py	2010-01-17 19:12:17 +0000
@@ -18,7 +18,7 @@
         L{_HasPath.getURL} raises C{NotImplementedError} if C{collectionName}
         is not overridden.
         """
-        endpoint = Endpoint('http://fluiddb.test.url/')
+        endpoint = Endpoint('http://fluiddb.url/')
         path = _HasPath(u'foo')
         self.assertRaises(NotImplementedError, path.getURL, endpoint)
 
@@ -38,44 +38,54 @@
         The getURL method returns the URL for this entity as accessed through
         the given endpoint.
         """
-        endpoint = Endpoint('http://fluiddb.test.url/')
+        endpoint = Endpoint('http://fluiddb.url/')
         path = _HasPath(u'foo')
-        path.collectionName = 'tests'
-        self.assertEqual(path.getURL(endpoint),
-                         'http://fluiddb.test.url/tests/foo')
+        path.collectionName = u'tests'
+        self.assertEqual(path.getURL(endpoint), 'http://fluiddb.url/tests/foo')
 
 
     def test_getURLPrefix(self):
         """
         Passing prefix to getURL prepends the given components to the path.
         """
-        endpoint = Endpoint('http://fluiddb.test.url/')
+        endpoint = Endpoint('http://fluiddb.url/')
         path = _HasPath(u'foo')
-        path.collectionName = 'tests'
+        path.collectionName = u'tests'
         self.assertEqual(path.getURL(endpoint, prefix=[u'quux', u'42']),
-                         'http://fluiddb.test.url/quux/42/foo')
+                         'http://fluiddb.url/quux/42/tests/foo')
 
 
     def test_getURLSuffix(self):
         """
         Passing suffix to getURL appends the given components to the path.
         """
-        endpoint = Endpoint('http://fluiddb.test.url/')
+        endpoint = Endpoint('http://fluiddb.url/')
         path = _HasPath(u'foo')
-        path.collectionName = 'tests'
+        path.collectionName = u'tests'
         self.assertEqual(path.getURL(endpoint, suffix=[u'quux', u'42']),
-                         'http://fluiddb.test.url/tests/foo/quux/42')
+                         'http://fluiddb.url/tests/foo/quux/42')
+
+
+    def test_getURLCollectionName(self):
+        """
+        Passing collectionName to getURL overrides the one in self.
+        """
+        endpoint = Endpoint('http://fluiddb.url/')
+        path = _HasPath(u'foo')
+        path.collectionName = u'tests'
+        self.assertEqual(path.getURL(endpoint, collectionName=u'new'),
+                         'http://fluiddb.url/new/foo')
 
 
     def test_urlEncoding(self):
         """
         URL encoding is done according to IRI rules.
         """
-        endpoint = Endpoint('http://fluiddb.test.url/')
+        endpoint = Endpoint('http://fluiddb.url/')
         path = _HasPath(u'r\xfasty')
-        path.collectionName = 'tests'
+        path.collectionName = u'tests'
         self.assertEqual(path.getURL(endpoint),
-                         'http://fluiddb.test.url/tests/r%C3%BAsty')
+                         'http://fluiddb.url/tests/r%C3%BAsty')
 
 
 
@@ -84,7 +94,7 @@
     Tests for L{Namespace}.
     """
     def setUp(self):
-        self.endpoint = MockEndpoint('http://fluiddb.test.url/')
+        self.endpoint = MockEndpoint('http://fluiddb.url/')
         self.namespace = Namespace(u'test')
 
 
@@ -118,8 +128,17 @@
         """
         The tag method returns a tag of the given name in this namespace.
         """
-        tag = Namespace(u'test').tag(u'sometag')
-        self.assertEqual(tag.getPath(), u'test/sometag')
+        tag = Namespace(u'test').tag(u'atag')
+        self.assertEqual(tag.getPath(), u'test/atag')
+
+
+    def test_tagValues(self):
+        """
+        The tagValues method returns a TagValues object for the given name
+        in this namespace.
+        """
+        tagValues = Namespace(u'test').tagValues(u'atag')
+        self.assertEqual(tagValues.getPath(), u'test/atag')
 
 
     def test_collectionName(self):
@@ -128,7 +147,7 @@
         """
         namespace = Namespace(u'test')
         self.assertEqual(namespace.child(u'namespace').getURL(self.endpoint),
-                         'http://fluiddb.test.url/namespaces/test/namespace')
+                         'http://fluiddb.url/namespaces/test/namespace')
 
 
     def test_getDescription(self):
@@ -146,7 +165,7 @@
         self.assertEqual(self.endpoint.method, 'GET')
         self.assertEqual(
             self.endpoint.url,
-            'http://fluiddb.test.url/namespaces/test?returnDescription=true')
+            'http://fluiddb.url/namespaces/test?returnDescription=true')
         self.assertEqual(self.endpoint.data, None)
         return d
 
@@ -160,7 +179,7 @@
         d = self.namespace.setDescription(self.endpoint, u'New description')
         self.assertEqual(self.endpoint.method, 'PUT')
         self.assertEqual(self.endpoint.url,
-                         'http://fluiddb.test.url/namespaces/test')
+                         'http://fluiddb.url/namespaces/test')
         self.assertEqual(json.loads(self.endpoint.data),
                          {u'description': u'New description'})
         return d
@@ -187,7 +206,7 @@
         self.assertEqual(self.endpoint.method, 'GET')
         self.assertEqual(
             self.endpoint.url,
-            'http://fluiddb.test.url/namespaces/test?returnNamespaces=true')
+            'http://fluiddb.url/namespaces/test?returnNamespaces=true')
         self.assertEqual(self.endpoint.data, None)
         return d
 
@@ -212,7 +231,7 @@
         self.assertEqual(self.endpoint.method, 'GET')
         self.assertEqual(
             self.endpoint.url,
-            'http://fluiddb.test.url/namespaces/test?returnTags=true')
+            'http://fluiddb.url/namespaces/test?returnTags=true')
         self.assertEqual(self.endpoint.data, None)
         return d
 
@@ -222,7 +241,7 @@
         Test creating a new namespace under an existing namespace.
         """
         res = {u'id': u'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx',
-               u'URI': u'http://fluiddb.test.url/namespaces/test/newchild'}
+               u'URI': u'http://fluiddb.url/namespaces/test/newchild'}
         self.endpoint.response = json.dumps(res)
 
         def _gotResult(ns):
@@ -234,7 +253,7 @@
                                        u'New child namespace')
         self.assertEqual(self.endpoint.method, 'POST')
         self.assertEqual(self.endpoint.url,
-                         'http://fluiddb.test.url/namespaces/test')
+                         'http://fluiddb.url/namespaces/test')
         self.assertEqual(json.loads(self.endpoint.data),
                          {u'name': u'newchild',
                           u'description': u'New child namespace'})
@@ -258,7 +277,7 @@
         Test creating a tag in a namespace.
         """
         response = {u'id': u'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx',
-                    u'URI': u'http://fluiddb.test.url/tags/test/newtag'}
+                    u'URI': u'http://fluiddb.url/tags/test/newtag'}
         self.endpoint.response = json.dumps(response)
 
         def _gotResult(tag):
@@ -271,7 +290,7 @@
                                      False)
         self.assertEqual(self.endpoint.method, 'POST')
         self.assertEqual(self.endpoint.url,
-                         'http://fluiddb.test.url/tags/test')
+                         'http://fluiddb.url/tags/test')
         self.assertEqual(json.loads(self.endpoint.data),
                          {u'name': u'newtag',
                           u'description': u'New tag',
@@ -301,7 +320,48 @@
         d = self.namespace.delete(self.endpoint)
         self.assertEqual(self.endpoint.method, 'DELETE')
         self.assertEqual(self.endpoint.url,
-                         'http://fluiddb.test.url/namespaces/test')
+                         'http://fluiddb.url/namespaces/test')
+        return d
+
+
+    def test_getPerms(self):
+        """
+        Test getting permissions for a namespace.
+        """
+        response = {u'policy': u'open',
+                    u'exceptions': [u'tom', u'dick', u'harry']}
+        self.endpoint.response = json.dumps(response)
+
+        def _gotResult((policy, exceptions)):
+            self.assertEqual(policy, u'open')
+            self.assertEqual(exceptions, [u'tom', u'dick', u'harry'])
+
+        d = self.namespace.getPerms(self.endpoint, 'create')
+        d.addCallback(_gotResult)
+        self.assertEqual(self.endpoint.method, 'GET')
+        self.assertEqual(
+            self.endpoint.url,
+            'http://fluiddb.url/permissions/namespaces/test?action=create')
+        return d
+
+
+    def test_setPerms(self):
+        """
+        Test setting permissions for a namespace.
+        """
+        self.endpoint.response = ''
+
+        d = self.namespace.setPerms(self.endpoint,
+                                    'create',
+                                    u'open',
+                                    [u'tom', u'dick', u'harry'])
+        self.assertEqual(self.endpoint.method, 'PUT')
+        self.assertEqual(
+            self.endpoint.url,
+            'http://fluiddb.url/permissions/namespaces/test?action=create')
+        self.assertEqual(json.loads(self.endpoint.data),
+                         {u'policy': u'open',
+                          u'exceptions': [u'tom', u'dick', u'harry']})
         return d
 
 
@@ -311,8 +371,8 @@
     Tests for L{Tag}.
     """
     def setUp(self):
-        self.endpoint = MockEndpoint('http://fluiddb.test.url/')
-        self.tag = Namespace(u'test').tag(u'sometag')
+        self.endpoint = MockEndpoint('http://fluiddb.url/')
+        self.tag = Namespace(u'test').tag(u'atag')
 
 
     def test_collectionName(self):
@@ -320,9 +380,9 @@
         Tags are under the collection name 'tags'.
         """
         namespace = Namespace(u'test')
-        endpoint = Endpoint('http://fluiddb.test.url/')
+        endpoint = Endpoint('http://fluiddb.url/')
         self.assertEqual(namespace.tag(u'tag').getURL(endpoint),
-                         'http://fluiddb.test.url/tags/test/tag')
+                         'http://fluiddb.url/tags/test/tag')
 
 
     def test_getDescription(self):
@@ -341,7 +401,7 @@
         self.assertEqual(self.endpoint.method, 'GET')
         self.assertEqual(
             self.endpoint.url,
-            'http://fluiddb.test.url/tags/test/sometag?returnDescription=true')
+            'http://fluiddb.url/tags/test/atag?returnDescription=true')
         self.assertEqual(self.endpoint.data, None)
         return d
 
@@ -355,7 +415,7 @@
         d = self.tag.setDescription(self.endpoint, u'New description')
         self.assertEqual(self.endpoint.method, 'PUT')
         self.assertEqual(self.endpoint.url,
-                         'http://fluiddb.test.url/tags/test/sometag')
+                         'http://fluiddb.url/tags/test/atag')
         self.assertEqual(json.loads(self.endpoint.data),
                          {u'description': u'New description'})
         return d
@@ -370,7 +430,107 @@
         d = self.tag.delete(self.endpoint)
         self.assertEqual(self.endpoint.method, 'DELETE')
         self.assertEqual(self.endpoint.url,
-                         'http://fluiddb.test.url/tags/test/sometag')
+                         'http://fluiddb.url/tags/test/atag')
+        return d
+
+
+    def test_getPerms(self):
+        """
+        Test getting permissions for a tag.
+        """
+        response = {u'policy': u'open',
+                    u'exceptions': [u'tom', u'dick', u'harry']}
+        self.endpoint.response = json.dumps(response)
+
+        def _gotResult((policy, exceptions)):
+            self.assertEqual(policy, u'open')
+            self.assertEqual(exceptions, [u'tom', u'dick', u'harry'])
+
+        d = self.tag.getPerms(self.endpoint, 'create').addCallback(_gotResult)
+        self.assertEqual(self.endpoint.method, 'GET')
+        self.assertEqual(
+            self.endpoint.url,
+            'http://fluiddb.url/permissions/tags/test/atag?action=create')
+        return d
+
+
+    def test_setPerms(self):
+        """
+        Test setting permissions for a tag.
+        """
+        self.endpoint.response = ''
+
+        d = self.tag.setPerms(self.endpoint,
+                              'create',
+                              u'open',
+                              [u'tom', u'dick', u'harry'])
+        self.assertEqual(self.endpoint.method, 'PUT')
+        self.assertEqual(
+            self.endpoint.url,
+            'http://fluiddb.url/permissions/tags/test/atag?action=create')
+        self.assertEqual(json.loads(self.endpoint.data),
+                         {u'policy': u'open',
+                          u'exceptions': [u'tom', u'dick', u'harry']})
+        return d
+
+
+class TagValueTests(TestCase):
+    """
+    Tests for L{TagValues}.
+    """
+    def setUp(self):
+        self.endpoint = MockEndpoint('http://fluiddb.url/')
+        self.tagValues = Namespace(u'test').tagValues(u'atag')
+
+
+    def test_collectionName(self):
+        """
+        Tag values are under the collection name 'tag-values'.
+        """
+        namespace = Namespace(u'test')
+        endpoint = Endpoint('http://fluiddb.url/')
+        self.assertEqual(namespace.tagValues(u'tag').getURL(endpoint),
+                         'http://fluiddb.url/tag-values/test/tag')
+
+
+    def test_getPerms(self):
+        """
+        Test getting permissions for a tag's values.
+        """
+        response = {u'policy': u'open',
+                    u'exceptions': [u'tom', u'dick', u'harry']}
+        self.endpoint.response = json.dumps(response)
+
+        def _gotResult((policy, exceptions)):
+            self.assertEqual(policy, u'open')
+            self.assertEqual(exceptions, [u'tom', u'dick', u'harry'])
+
+        d = self.tagValues.getPerms(self.endpoint, 'create')
+        d.addCallback(_gotResult)
+        self.assertEqual(self.endpoint.method, 'GET')
+        self.assertEqual(
+            self.endpoint.url,
+            'http://fluiddb.url/permissions/tag-values/test/atag?action=create')
+        return d
+
+
+    def test_setPerms(self):
+        """
+        Test setting permissions for a tag.
+        """
+        self.endpoint.response = ''
+
+        d = self.tagValues.setPerms(self.endpoint,
+                                    'create',
+                                    u'open',
+                                    [u'tom', u'dick', u'harry'])
+        self.assertEqual(self.endpoint.method, 'PUT')
+        self.assertEqual(
+            self.endpoint.url,
+            'http://fluiddb.url/permissions/tag-values/test/atag?action=create')
+        self.assertEqual(json.loads(self.endpoint.data),
+                         {u'policy': u'open',
+                          u'exceptions': [u'tom', u'dick', u'harry']})
         return d
 
 
@@ -401,7 +561,7 @@
         """
         Constructing an endpoint stores the given base URL.
         """
-        url = 'http://fluiddb.test.url/'
+        url = 'http://fluiddb.url/'
         endpoint = Endpoint(url)
         self.assertEqual(endpoint.baseURL, url)
 
@@ -426,9 +586,9 @@
         """
         The root URL must include the API version if specified.
         """
-        endpoint = Endpoint('http://fluiddb.test.url/', '20090817')
+        endpoint = Endpoint('http://fluiddb.url/', '20090817')
         self.assertEqual(endpoint.getRootURL(),
-                         'http://fluiddb.test.url/20090817/')
+                         'http://fluiddb.url/20090817/')
 
 
     def test_basicAuth(self):
@@ -437,9 +597,9 @@
         with every request.
         """
         creds = BasicCreds('testuser', 'password')
-        endpoint = MockEndpoint('http://fluiddb.test.url/', creds=creds)
+        endpoint = MockEndpoint('http://fluiddb.url/', creds=creds)
         endpoint.response = ''
-        endpoint.submit('http://fluiddb.test.url/blah', 'GET')
+        endpoint.submit('http://fluiddb.url/blah', 'GET')
         self.assertEqual(endpoint.headers['Authorization'],
                          'Basic dGVzdHVzZXI6cGFzc3dvcmQ=')
 
@@ -458,7 +618,7 @@
     Tests for L{Object}.
     """
     def setUp(self):
-        self.endpoint = MockEndpoint('http://fluiddb.test.url/')
+        self.endpoint = MockEndpoint('http://fluiddb.url/')
 
 
     def test_getTags(self):
@@ -484,7 +644,7 @@
         self.assertEqual(self.endpoint.method, 'GET')
         self.assertEqual(
             self.endpoint.url,
-            'http://fluiddb.test.url/objects/xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx')
+            'http://fluiddb.url/objects/xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx')
         self.assertEqual(json.loads(self.endpoint.data),
                          {u'showAbout': True})
         return d
@@ -504,7 +664,7 @@
         self.assertEqual(self.endpoint.data, None)
         self.assertEqual(
             self.endpoint.url,
-            'http://fluiddb.test.url/objects/xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx/test/tag')
+            'http://fluiddb.url/objects/xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx/test/tag')
         return d
 
 
@@ -553,7 +713,7 @@
         self.assertEqual(self.endpoint.method, 'DELETE')
         self.assertEqual(
             self.endpoint.url,
-            'http://fluiddb.test.url/objects/xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx/test/tag')
+            'http://fluiddb.url/objects/xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx/test/tag')
         self.assertEqual(self.endpoint.data, None)
         return d
 
@@ -570,7 +730,7 @@
         self.assertEqual(self.endpoint.method, 'PUT')
         self.assertEqual(
             self.endpoint.url,
-            'http://fluiddb.test.url/objects/xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx/test/tag')
+            'http://fluiddb.url/objects/xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx/test/tag')
         self.assertEqual(json.loads(self.endpoint.data), 42)
         return d
 
@@ -588,7 +748,7 @@
         self.assertEqual(self.endpoint.method, 'PUT')
         self.assertEqual(
             self.endpoint.url,
-            'http://fluiddb.test.url/objects/xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx/test/tag')
+            'http://fluiddb.url/objects/xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx/test/tag')
         self.assertEqual(self.endpoint.data, '<p>foo</p>')
         self.assertEqual(self.endpoint.headers['Content-Type'], 'text/html')
         return d
@@ -598,7 +758,7 @@
         """
         Creating an object returns the newly created object.
         """
-        response = {u'URI': u'http://fluiddb.test.url/objects/xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx',
+        response = {u'URI': u'http://fluiddb.url/objects/xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx',
                     u'id': u'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'}
         self.endpoint.response = json.dumps(response)
 
@@ -608,7 +768,7 @@
 
         d = Object.create(self.endpoint).addCallback(_gotResponse)
         self.assertEqual(self.endpoint.method, 'POST')
-        self.assertEqual(self.endpoint.url, 'http://fluiddb.test.url/objects')
+        self.assertEqual(self.endpoint.url, 'http://fluiddb.url/objects')
         self.assertEqual(self.endpoint.data, None)
         return d
 
@@ -617,7 +777,7 @@
         """
         Test creating an object with an about value.
         """
-        response = {u'URI': u'http://fluiddb.test.url/objects/xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx',
+        response = {u'URI': u'http://fluiddb.url/objects/xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx',
                     u'id': u'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'}
         self.endpoint.response = json.dumps(response)
 
@@ -627,7 +787,7 @@
 
         d = Object.create(self.endpoint, u'New object').addCallback(_gotResponse)
         self.assertEqual(self.endpoint.method, 'POST')
-        self.assertEqual(self.endpoint.url, 'http://fluiddb.test.url/objects')
+        self.assertEqual(self.endpoint.url, 'http://fluiddb.url/objects')
         self.assertEqual(json.loads(self.endpoint.data),
                          {u'about': u'New object'})
         return d
@@ -651,6 +811,6 @@
 
         d = Object.query(self.endpoint, u'has fluiddb/about').addCallback(_gotResponse)
         self.assertEqual(self.endpoint.method, 'GET')
-        self.assertEqual(self.endpoint.url, 'http://fluiddb.test.url/objects?query=has+fluiddb%2Fabout')
+        self.assertEqual(self.endpoint.url, 'http://fluiddb.url/objects?query=has+fluiddb%2Fabout')
         self.assertEqual(self.endpoint.data, None)
         return d