Merge lp:~eday/burrow/backend-unittests into lp:burrow

[Eric Day]

Pushed wait functionality down into backend, removed frontend tests since this is replaced with HTTP backend test now.

=== modified file 'burrow/backend/__init__.py'
--- burrow/backend/__init__.py	2011-08-10 05:22:20 +0000
+++ burrow/backend/__init__.py	2011-08-10 07:23:26 +0000
@@ -66,26 +66,6 @@
     def update_message(self, account, queue, message, attributes, filters={}):
         return None
 
-    def notify(self, account, queue):
-        '''Notify any waiting callers that the account/queue has
-        a visible message.'''
-        queue = '%s/%s' % (account, queue)
-        if queue in self.queues:
-            for count in xrange(0, self.queues[queue].getting()):
-                self.queues[queue].put(0)
-
-    def wait(self, account, queue, seconds):
-        '''Wait for a message to appear in the account/queue.'''
-        queue = '%s/%s' % (account, queue)
-        if queue not in self.queues:
-            self.queues[queue] = eventlet.Queue()
-        try:
-            self.queues[queue].get(timeout=seconds)
-        except Exception:
-            pass
-        if self.queues[queue].getting() == 0:
-            del self.queues[queue]
-
     def clean(self):
         '''This method should remove all messages with an expired
         TTL and make hidden messages that have an expired hide time
@@ -124,6 +104,60 @@
             raise burrow.backend.InvalidArguments(detail)
         return detail
 
+    def _notify(self, account, queue):
+        '''Notify any waiting callers that the account/queue has
+        a visible message.'''
+        queue = '%s/%s' % (account, queue)
+        if queue in self.queues:
+            for count in xrange(0, self.queues[queue].getting()):
+                self.queues[queue].put(0)
+
+    def _wait(self, account, queue, seconds):
+        '''Wait for a message to appear in the account/queue.'''
+        queue = '%s/%s' % (account, queue)
+        if queue not in self.queues:
+            self.queues[queue] = eventlet.Queue()
+        try:
+            self.queues[queue].get(timeout=seconds)
+        except Exception:
+            pass
+        if self.queues[queue].getting() == 0:
+            del self.queues[queue]
+
+
+def wait_without_attributes(method):
+    def wrapper(self, account, queue, filters={}):
+        original = lambda: method(self, account, queue, filters)
+        return wait(self, account, queue, filters, original)
+    return wrapper
+
+
+def wait_with_attributes(method):
+    def wrapper(self, account, queue, attributes, filters={}):
+        original = lambda: method(self, account, queue, attributes, filters)
+        return wait(self, account, queue, filters, original)
+    return wrapper
+
+
+def wait(self, account, queue, filters, method):
+    '''Decorator to wait on a queue if the wait option is given. This
+    will block until a message in the queue is ready or the timeout
+    expires.'''
+    wait = filters.get('wait', 0)
+    if wait > 0:
+        wait += time.time()
+    while True:
+        try:
+            for message in method():
+                yield message
+            return
+        except burrow.backend.NotFound, e:
+            now = time.time()
+            if wait - now > 0:
+                self._wait(account, queue, wait - now)
+            if wait < time.time():
+                raise e
+
 
 class NotFound(Exception):
     pass

=== modified file 'burrow/backend/http.py'
--- burrow/backend/http.py	2011-08-10 05:22:20 +0000
+++ burrow/backend/http.py	2011-08-10 07:23:26 +0000
@@ -139,7 +139,7 @@
                     return
             yield body
         if response.status == 400:
-            raise burrow.backend.InvalidArguments()
+            raise burrow.backend.InvalidArguments(response.reason)
         if response.status == 404:
             raise burrow.backend.NotFound()
         raise Exception(response.reason)

=== modified file 'burrow/backend/memory.py'
--- burrow/backend/memory.py	2011-08-09 19:43:03 +0000
+++ burrow/backend/memory.py	2011-08-10 07:23:26 +0000
@@ -67,6 +67,7 @@
             if detail is not None:
                 yield queue.detail(detail)
 
+    @burrow.backend.wait_without_attributes
     def delete_messages(self, account, queue, filters={}):
         account, queue = self.accounts.get_queue(account, queue)
         detail = self._get_message_detail(filters)
@@ -77,6 +78,7 @@
         if queue.messages.count() == 0:
             self.accounts.delete_queue(account.id, queue.id)
 
+    @burrow.backend.wait_without_attributes
     def get_messages(self, account, queue, filters={}):
         account, queue = self.accounts.get_queue(account, queue)
         detail = self._get_message_detail(filters, 'all')
@@ -84,6 +86,7 @@
             if detail is not None:
                 yield message.detail(detail)
 
+    @burrow.backend.wait_with_attributes
     def update_messages(self, account, queue, attributes, filters={}):
         account, queue = self.accounts.get_queue(account, queue)
         notify = False
@@ -99,7 +102,7 @@
             if detail is not None:
                 yield message.detail(detail)
         if notify:
-            self.notify(account.id, queue.id)
+            self._notify(account.id, queue.id)
 
     def create_message(self, account, queue, message, body, attributes={}):
         account, queue = self.accounts.get_queue(account, queue, True)
@@ -114,7 +117,7 @@
         message.hide = hide
         message.body = body
         if created or hide == 0:
-            self.notify(account.id, queue.id)
+            self._notify(account.id, queue.id)
         return created
 
     def delete_message(self, account, queue, message, filters={}):
@@ -142,7 +145,7 @@
         if hide is not None:
             message.hide = hide
             if hide == 0:
-                self.notify(account.id, queue.id)
+                self._notify(account.id, queue.id)
         return message.detail(detail)
 
     def clean(self):
@@ -157,7 +160,7 @@
                         message.hide = 0
                         notify = True
                 if notify:
-                    self.notify(account.id, queue.id)
+                    self._notify(account.id, queue.id)
                 if queue.messages.count() == 0:
                     self.accounts.delete_queue(account.id, queue.id)
 

=== modified file 'burrow/backend/sqlite.py'
--- burrow/backend/sqlite.py	2011-08-09 23:04:39 +0000
+++ burrow/backend/sqlite.py	2011-08-10 07:23:26 +0000
@@ -211,6 +211,7 @@
             raise burrow.backend.NotFound()
         return rows[0][0]
 
+    @burrow.backend.wait_without_attributes
     def delete_messages(self, account, queue, filters={}):
         account_rowid = self._get_account(account)
         queue_rowid = self._get_queue(account_rowid, queue)
@@ -257,6 +258,7 @@
             return dict(id=row[0], ttl=ttl, hide=hide, body=str(row[3]))
         return None
 
+    @burrow.backend.wait_without_attributes
     def get_messages(self, account, queue, filters={}):
         account_rowid = self._get_account(account)
         queue_rowid = self._get_queue(account_rowid, queue)
@@ -304,6 +306,7 @@
             return rows[0]
         return rows[0][0]
 
+    @burrow.backend.wait_with_attributes
     def update_messages(self, account, queue, attributes, filters={}):
         account_rowid = self._get_account(account)
         queue_rowid = self._get_queue(account_rowid, queue)
@@ -329,7 +332,7 @@
             if self._update_messages(ttl, hide, ids):
                 notify = True
         if notify:
-            self.notify(account, queue)
+            self._notify(account, queue)
 
     def _update_messages(self, ttl, hide, ids):
         query = 'UPDATE messages SET '
@@ -372,7 +375,7 @@
             self.db.execute(query, (queue_rowid, message, ttl, hide, body))
             created = True
         if created or hide == 0:
-            self.notify(account, queue)
+            self._notify(account, queue)
         return created
 
     def delete_message(self, account, queue, message, filters={}):
@@ -396,7 +399,7 @@
         detail = self._get_message_detail(filters)
         ttl, hide = self._get_attributes(attributes)
         if self._update_messages(ttl, hide, [row[0]]):
-            self.notify(account, queue)
+            self._notify(account, queue)
         row = list(row)
         if ttl is not None:
             row[2] = ttl
@@ -444,4 +447,4 @@
                 'ON queues.account=accounts.rowid ' \
                 'WHERE queues.rowid=?'
             result = self.db.execute(query, (queue,)).fetchall()[0]
-            self.notify(result[0], result[1])
+            self._notify(result[0], result[1])

=== modified file 'burrow/frontend/wsgi.py'
--- burrow/frontend/wsgi.py	2011-08-10 05:22:20 +0000
+++ burrow/frontend/wsgi.py	2011-08-10 07:23:26 +0000
@@ -15,7 +15,6 @@
 '''WSGI frontend for the burrow server.'''
 
 import json
-import time
 import types
 
 import eventlet
@@ -39,30 +38,6 @@
 DEFAULT_HIDE = 0
 
 
-def wait_on_queue(method):
-    '''Decorator to wait on an account/queue if the wait option is
-    given. This will block until a message in the queue is ready or
-    the timeout expires.'''
-    def wrapper(self, req, account, queue, *args, **kwargs):
-        '''Wrapper method for wait_on_queue.'''
-        wait = 0
-        if 'wait' in req.params:
-            wait = int(req.params['wait'])
-            if wait > 0:
-                wait += time.time()
-        while True:
-            res = method(self, req, account, queue, *args, **kwargs)
-            if wait == 0 or res.status_int != 404:
-                break
-            now = time.time()
-            if wait - now > 0:
-                self.backend.wait(account, queue, wait - now)
-            if wait < time.time():
-                break
-        return res
-    return wrapper
-
-
 class Frontend(burrow.frontend.Frontend):
     '''Frontend implementation that implements the Burrow v1.0 protocol
     using WSGI.'''
@@ -148,21 +123,18 @@
         return self._response(body=self.backend.get_queues(account, filters))
 
     @webob.dec.wsgify
-    @wait_on_queue
     def _delete_messages(self, req, account, queue):
         filters = self._parse_filters(req)
         messages = self.backend.delete_messages(account, queue, filters)
         return self._response(body=messages)
 
     @webob.dec.wsgify
-    @wait_on_queue
     def _get_messages(self, req, account, queue):
         filters = self._parse_filters(req)
         messages = self.backend.get_messages(account, queue, filters)
         return self._response(body=messages)
 
     @webob.dec.wsgify
-    @wait_on_queue
     def _post_messages(self, req, account, queue):
         attributes = self._parse_attributes(req)
         filters = self._parse_filters(req)
@@ -215,6 +187,8 @@
             filters['match_hidden'] = True
         if 'detail' in req.params:
             filters['detail'] = req.params['detail']
+        if 'wait' in req.params:
+            filters['wait'] = int(req.params['wait'])
         return filters
 
     def _parse_attributes(self, req, default_ttl=None, default_hide=None):

=== modified file 'test/backend/test_http.py'
--- test/backend/test_http.py	2011-08-10 05:22:20 +0000
+++ test/backend/test_http.py	2011-08-10 07:23:26 +0000
@@ -34,7 +34,7 @@
 
 def kill_server():
     try:
-        pid_file = open('server.pid', 'r')
+        pid_file = open('TestHTTP.pid', 'r')
         pid = pid_file.read()
         pid_file.close()
         try:
@@ -43,12 +43,13 @@
             os.kill(int(pid), signal.SIGTERM)
         except OSError:
             pass
-        os.unlink('server.pid')
+        os.unlink('TestHTTP.pid')
     except IOError:
         pass
 
 
 def start_server():
+    kill_server()
     pid = os.fork()
     if pid == 0:
         try:
@@ -66,12 +67,11 @@
         server.frontends[0].default_ttl = 0
         server.run()
         os.exit(0)
-    pid_file = open('server.pid', 'w')
+    pid_file = open('TestHTTP.pid', 'w')
     pid_file.write(str(pid))
     pid_file.close()
+    atexit.register(kill_server)
     time.sleep(1)
 
 
-kill_server()
 start_server()
-atexit.register(kill_server)

=== modified file 'test/backend/test_memory.py'
--- test/backend/test_memory.py	2011-08-10 05:22:20 +0000
+++ test/backend/test_memory.py	2011-08-10 07:23:26 +0000
@@ -16,6 +16,9 @@
 import time
 import unittest
 
+import eventlet
+eventlet.monkey_patch(socket=True)
+
 import burrow.backend
 import burrow.backend.memory
 
@@ -884,7 +887,48 @@
         self.assertEquals(dict(id='0', ttl=0, hide=0, body='0'), message)
         self.delete_messages()
 
+    def test_message_create_wait(self):
+        self.success = False
+        thread = eventlet.spawn(self.get_messages)
+        eventlet.spawn_after(0.2,
+            self.backend.create_message, 'a', 'q', 'm', 'test')
+        thread.wait()
+        self.assertTrue(self.success)
+        self.delete_messages()
+
+    def test_message_update_wait(self):
+        attributes = dict(hide=100)
+        self.backend.create_message('a', 'q', 'm', 'test', attributes)
+        self.success = False
+        thread = eventlet.spawn(self.get_messages)
+        attributes = dict(hide=0)
+        eventlet.spawn_after(0.2,
+            self.backend.update_message, 'a', 'q', 'm', attributes)
+        thread.wait()
+        self.assertTrue(self.success)
+        self.delete_messages()
+
+    def test_messages_update_wait(self):
+        attributes = dict(hide=100)
+        self.backend.create_message('a', 'q', 'm', 'test', attributes)
+        self.success = False
+        thread = eventlet.spawn(self.get_messages)
+        attributes = dict(hide=0)
+        filters = dict(match_hidden=True)
+        messages = self.backend.update_messages('a', 'q', attributes, filters)
+        eventlet.spawn_after(0.2, list, messages)
+        thread.wait()
+        self.assertTrue(self.success)
+        self.delete_messages()
+
     def delete_messages(self):
         filters = dict(match_hidden=True)
         messages = list(self.backend.delete_messages('a', 'q', filters))
         self.assertEquals([], messages)
+
+    def get_messages(self):
+        message = dict(id='m', ttl=0, hide=0, body='test')
+        filters = dict(wait=2)
+        messages = list(self.backend.get_messages('a', 'q', filters))
+        self.assertEquals([message], messages)
+        self.success = True

=== removed directory 'test/frontend'
=== removed file 'test/frontend/__init__.py'
=== removed file 'test/frontend/test_wsgi.py'
--- test/frontend/test_wsgi.py	2011-08-09 17:22:31 +0000
+++ test/frontend/test_wsgi.py	1970-01-01 00:00:00 +0000
@@ -1,303 +0,0 @@
-# Copyright (C) 2011 OpenStack LLC.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import ConfigParser
-import json
-import time
-import unittest
-
-import eventlet
-import webob
-
-import burrow.backend.memory
-import burrow.backend.sqlite
-import burrow.frontend.wsgi
-
-
-class TestWSGIMemory(unittest.TestCase):
-    '''Unittests for the WSGI frontend to SQLite backend.'''
-    backend_class = burrow.backend.memory.Backend
-
-    def setUp(self):
-        config = (ConfigParser.ConfigParser(), 'test')
-        self.backend = self.backend_class(config)
-        self.frontend = burrow.frontend.wsgi.Frontend(config, self.backend)
-        self.frontend.default_ttl = 0
-        self._get_url('', status=404)
-        self._get_url('/a', status=404)
-        self._get_url('/a/q', status=404)
-
-    def tearDown(self):
-        self._get_url('/a/q', status=404)
-        self._get_url('/a', status=404)
-        self._get_url('', status=404)
-
-    def test_account(self):
-        self._put_url('/a/q/1')
-        result = self._get_url('')
-        self.assertEquals(result, ['a'])
-        self._delete_url('/a')
-
-    def test_queue(self):
-        self._put_url('/a/q/1')
-        result = self._get_url('/a')
-        self.assertEquals(result, ['q'])
-        self._delete_url('/a/q')
-
-    def test_message(self):
-        self._put_url('/a/q/1', body='b')
-        result = self._get_url('/a/q')
-        self.assertMessages(result, [self.message('1', body='b')])
-        self._delete_url('/a/q/1')
-
-    def test_message_post(self):
-        self._put_url('/a/q/1', body='b')
-        for x in range(0, 3):
-            self._post_url('/a/q/1?ttl=%d&hide=%d' % (x, x), status=204)
-            result = self._get_url('/a/q?match_hidden=true')
-            message = self.message('1', x, x, body='b')
-            self.assertMessages(result, [message])
-        self._delete_url('/a/q/1')
-
-    def test_message_put(self):
-        for x in range(0, 3):
-            url = '/a/q/1?ttl=%d&hide=%d' % (x, x)
-            status = 201 if x == 0 else 204
-            self._put_url(url, body=str(x), status=status)
-            result = self._get_url('/a/q?match_hidden=true')
-            message = self.message('1', x, x, body=str(x))
-            self.assertMessages(result, [message])
-        self._delete_url('/a/q/1')
-
-    def test_message_delete_limit(self):
-        [self._put_url('/a/q/%d' % x) for x in range(1, 5)]
-        result = self._delete_url('/a/q?limit=3&detail=all', status=200)
-        messages = []
-        messages.append(self.message('1'))
-        messages.append(self.message('2'))
-        messages.append(self.message('3'))
-        self.assertMessages(result, messages)
-        result = self._delete_url('/a/q?limit=3&detail=all', status=200)
-        message = self.message('4')
-        self.assertMessages(result, [message])
-
-    def test_message_get_limit(self):
-        [self._put_url('/a/q/%d' % x) for x in range(1, 5)]
-        for x in range(0, 4):
-            result = self._get_url('/a/q?limit=3')
-            messages = []
-            for y in range(x, 4)[:3]:
-                messages.append(self.message(str(y + 1)))
-            self.assertMessages(result, messages)
-            self._delete_url('/a/q/%d' % (x + 1))
-
-    def test_message_post_limit(self):
-        [self._put_url('/a/q/%d' % x) for x in range(1, 5)]
-        for x in range(0, 4):
-            result = self._post_url('/a/q?limit=3&ttl=%d&detail=all' % x)
-            messages = []
-            for y in range(x, 4)[:3]:
-                messages.append(self.message(str(y + 1), x))
-            self.assertMessages(result, messages)
-            self._delete_url('/a/q/%d' % (x + 1))
-
-    def test_message_delete_marker(self):
-        [self._put_url('/a/q/%d' % x) for x in range(1, 5)]
-        result = self._delete_url('/a/q?marker=2&detail=all', status=200)
-        messages = []
-        messages.append(self.message('3'))
-        messages.append(self.message('4'))
-        self.assertMessages(result, messages)
-        result = self._delete_url('/a/q?marker=5&detail=all', status=200)
-        messages = []
-        messages.append(self.message('1'))
-        messages.append(self.message('2'))
-        self.assertMessages(result, messages)
-
-    def test_message_get_marker(self):
-        [self._put_url('/a/q/%d' % x) for x in range(1, 5)]
-        for x in range(0, 4):
-            result = self._get_url('/a/q?marker=%d' % x)
-            messages = []
-            for y in range(x, 4):
-                messages.append(self.message(str(y + 1)))
-            self.assertMessages(result, messages)
-            self._delete_url('/a/q/%d' % (x + 1))
-
-    def test_message_post_marker(self):
-        [self._put_url('/a/q/%d' % x) for x in range(1, 5)]
-        for x in range(0, 4):
-            url = '/a/q?marker=%d&ttl=%d&detail=all' % (x, x)
-            result = self._post_url(url)
-            messages = []
-            for y in range(x, 4):
-                messages.append(self.message(str(y + 1), x))
-            self.assertMessages(result, messages)
-            self._delete_url('/a/q/%d' % (x + 1))
-
-    def test_message_delete_limit_marker(self):
-        [self._put_url('/a/q/%d' % x) for x in range(1, 5)]
-        url = '/a/q?limit=2&marker=1&detail=all'
-        result = self._delete_url(url, status=200)
-        messages = []
-        messages.append(self.message('2'))
-        messages.append(self.message('3'))
-        self.assertMessages(result, messages)
-        url = '/a/q?limit=2&marker=5&detail=all'
-        result = self._delete_url(url, status=200)
-        messages = []
-        messages.append(self.message('1'))
-        messages.append(self.message('4'))
-        self.assertMessages(result, messages)
-
-    def test_message_get_limit_marker(self):
-        [self._put_url('/a/q/%d' % x) for x in range(1, 5)]
-        for x in range(0, 4):
-            result = self._get_url('/a/q?limit=2&marker=%d' % x)
-            messages = []
-            for y in range(x, 4)[:2]:
-                messages.append(self.message(str(y + 1)))
-            self.assertMessages(result, messages)
-            self._delete_url('/a/q/%d' % (x + 1))
-
-    def test_message_post_limit_marker(self):
-        [self._put_url('/a/q/%d' % x) for x in range(1, 5)]
-        for x in range(0, 4):
-            url = '/a/q?limit=2&marker=%d&ttl=%d&detail=all' % (x, x)
-            result = self._post_url(url)
-            messages = []
-            for y in range(x, 4)[:2]:
-                messages.append(self.message(str(y + 1), x))
-            self.assertMessages(result, messages)
-            self._delete_url('/a/q/%d' % (x + 1))
-
-    def test_message_ttl(self):
-        self._put_url('/a/q/1?ttl=1')
-        result = self._get_url('/a/q/1')
-        self.assertMessages([result], [self.message('1', 1)])
-        time.sleep(1)
-        self.backend.clean()
-        self._get_url('/a/q/1', status=404)
-        self._put_url('/a/q/1')
-        result = self._get_url('/a/q/1')
-        self.assertMessages([result], [self.message('1')])
-        self._post_url('/a/q/1?ttl=1', status=204)
-        result = self._get_url('/a/q/1')
-        self.assertMessages([result], [self.message('1', 1)])
-        time.sleep(1)
-        self.backend.clean()
-        self._get_url('/a/q/1', status=404)
-
-    def test_message_hide(self):
-        self._put_url('/a/q/1?hide=1')
-        result = self._get_url('/a/q/1')
-        self.assertMessages([result], [self.message('1', hide=1)])
-        time.sleep(1)
-        self.backend.clean()
-        result = self._get_url('/a/q/1')
-        self.assertMessages([result], [self.message('1')])
-        self._post_url('/a/q/1?hide=1', status=204)
-        result = self._get_url('/a/q/1')
-        self.assertMessages([result], [self.message('1', hide=1)])
-        time.sleep(1)
-        self.backend.clean()
-        result = self._get_url('/a/q/1')
-        self.assertMessages([result], [self.message('1')])
-        self._delete_url('/a/q/1')
-
-    def _message_wait(self):
-        result = self._get_url('/a/q?wait=2')
-        self.assertMessages(result, [self.message('1')])
-        self.success = True
-
-    def test_message_put_wait(self):
-        self.success = False
-        thread = eventlet.spawn(self._message_wait)
-        eventlet.spawn_after(0.2, self._put_url, '/a/q/1')
-        thread.wait()
-        self.assertTrue(self.success)
-        self._delete_url('/a/q/1')
-
-    def test_message_put_wait_overwrite(self):
-        self.success = False
-        self._put_url('/a/q/1?hide=10')
-        thread = eventlet.spawn(self._message_wait)
-        eventlet.spawn_after(0.2, self._put_url, '/a/q/1?hide=0', status=204)
-        thread.wait()
-        self.assertTrue(self.success)
-        self._delete_url('/a/q/1')
-
-    def test_message_put_wait_cleanup(self):
-        self.success = False
-        self._put_url('/a/q/1?hide=1')
-        thread = eventlet.spawn(self._message_wait)
-        eventlet.spawn_after(1, self.backend.clean)
-        thread.wait()
-        self.assertTrue(self.success)
-        self._delete_url('/a/q/1')
-
-    def test_message_post_wait(self):
-        self.success = False
-        self._put_url('/a/q/1?hide=10')
-        thread = eventlet.spawn(self._message_wait)
-        eventlet.spawn_after(0.2, self._post_url, '/a/q/1?hide=0', status=204)
-        thread.wait()
-        self.assertTrue(self.success)
-        self._delete_url('/a/q/1')
-
-    def test_message_post_wait_queue(self):
-        self.success = False
-        self._put_url('/a/q/1?hide=10')
-        thread = eventlet.spawn(self._message_wait)
-        url = '/a/q?hide=0&match_hidden=true'
-        eventlet.spawn_after(0.2, self._post_url, url, status=204)
-        thread.wait()
-        self.assertTrue(self.success)
-        self._delete_url('/a/q/1')
-
-    def message(self, id, ttl=0, hide=0, body=''):
-        return dict(id=id, ttl=ttl, hide=hide, body=body)
-
-    def assertMessages(self, first, second):
-        self.assertEquals(len(first), len(second))
-        for x in xrange(0, len(second)):
-            self.assertEquals(first[x]['id'], second[x]['id'])
-            self.assertAlmostEquals(first[x]['ttl'], second[x]['ttl'])
-            self.assertAlmostEquals(first[x]['hide'], second[x]['hide'])
-            self.assertEquals(first[x]['body'], second[x]['body'])
-
-    def _delete_url(self, url, status=204, **kwargs):
-        return self._url('DELETE', url, status=status, **kwargs)
-
-    def _get_url(self, url, **kwargs):
-        return self._url('GET', url, **kwargs)
-
-    def _post_url(self, url, **kwargs):
-        return self._url('POST', url, **kwargs)
-
-    def _put_url(self, url, status=201, **kwargs):
-        return self._url('PUT', url, status=status, **kwargs)
-
-    def _url(self, method, url, body='', status=200):
-        req = webob.Request.blank('/v1.0' + url, method=method, body=body)
-        res = req.get_response(self.frontend)
-        self.assertEquals(res.status_int, status)
-        if status == 200:
-            return json.loads(res.body)
-        return None
-
-
-class TestWSGISQLite(TestWSGIMemory):
-    '''Unittests for the WSGI frontend to SQLite backend.'''
-    backend_class = burrow.backend.sqlite.Backend