better-tests.diff

diff --git a/codenode/frontend/notebook/models.py b/codenode/frontend/notebook/models.py
index 56a8ec3..2c55fff 100644
--- a/codenode/frontend/notebook/models.py
+++ b/codenode/frontend/notebook/models.py
@@ -28,7 +28,7 @@ class Notebook(models.Model):
 
     def save(self):
         if not self.guid:
-            self.guid = str(uuid.uuid4()).replace("-", "")
+            self.guid = unicode(uuid.uuid4()).replace("-", "")
         super(Notebook, self).save()
 
     def last_modified_time(self):
diff --git a/codenode/frontend/search/tests.py b/codenode/frontend/search/tests.py
index 507cbae..3ab7b7e 100644
--- a/codenode/frontend/search/tests.py
+++ b/codenode/frontend/search/tests.py
@@ -9,6 +9,8 @@ from codenode.frontend.notebook import models
 from codenode.frontend.search import views
 from codenode.frontend.search import search
 
+from codenode.frontend.backend import models as backend_models 
+
 #If you see this error: 
 #  OSError: [Errno 17] File exists: 'tests/search_index/_MAIN_LOCK'
 #Do this:
@@ -26,6 +28,11 @@ class TestSearch(TestCase):
         
         self.user1 = User.objects.get(username__exact='test')
         self.user2 = User.objects.get(username__exact='test2')
+
+        self.backend_server = backend_models.BackendServer(name="temp_backend_server", address="http://example.com")
+        self.backend_server.save()
+        self.engine_type = backend_models.EngineType(name="python", backend=self.backend_server)
+        self.engine_type.save()
         
     def tearDown(self):
         allnotebooks = models.Notebook.objects.all()
@@ -46,11 +53,16 @@ class TestSearch(TestCase):
         #"""
         nb1 = models.Notebook(owner=self.user1)
         nb1.save()
+        nb1_record = backend_models.NotebookBackendRecord(notebook=nb1, engine_type=self.engine_type)
+        nb1_record.save()
+
         nb2 = models.Notebook(owner=self.user1)
         nb2.save()
+        nb2_record = backend_models.NotebookBackendRecord(notebook=nb2, engine_type=self.engine_type)
+        nb2_record.save()
  
         cell1 = models.Cell(
-            guid=str(uuid.uuid4()).replace("-", ""), 
+            guid=unicode(uuid.uuid4()).replace("-", ""), 
             notebook=nb1,
             owner=nb1.owner,
             content="foo=1\nbar=foo+foo"
@@ -58,14 +70,14 @@ class TestSearch(TestCase):
         cell1.save()
  
         cell2 = models.Cell(
-            guid=str(uuid.uuid4()).replace("-", ""), 
+            guid=unicode(uuid.uuid4()).replace("-", ""), 
             notebook=nb2,
             owner=nb2.owner,
             content="baz=1\nbar=baz+baz"
             )
         cell2.save()
 
-        guids = [result["nbid"] for result in search.search("foo")]
+        guids = [result["nbid"] for result in search.search(u"foo")]
         assert nb1.guid in guids
         assert nb2.guid not in guids
 
@@ -73,13 +85,21 @@ class TestSearch(TestCase):
     def test_view_search(self):
         nb1 = models.Notebook(owner=self.user1)
         nb1.save()
+        nb1_record = backend_models.NotebookBackendRecord(notebook=nb1, engine_type=self.engine_type)
+        nb1_record.save()
+
         nb2 = models.Notebook(owner=self.user2, title="Foo is Foo")
         nb2.save()
+        nb2_record = backend_models.NotebookBackendRecord(notebook=nb2, engine_type=self.engine_type)
+        nb2_record.save()
+
         nb3 = models.Notebook(owner=self.user2)
         nb3.save()
+        nb3_record = backend_models.NotebookBackendRecord(notebook=nb3, engine_type=self.engine_type)
+        nb3_record.save()
  
         cell1 = models.Cell(
-            guid=str(uuid.uuid4()).replace("-", ""), 
+            guid=unicode(uuid.uuid4()).replace("-", ""), 
             notebook=nb1,
             owner=nb1.owner,
             content="foo=1\nbar=foo+foo"
@@ -87,7 +107,7 @@ class TestSearch(TestCase):
         cell1.save()
  
         cell2 = models.Cell(
-            guid=str(uuid.uuid4()).replace("-", ""), 
+            guid=unicode(uuid.uuid4()).replace("-", ""), 
             notebook=nb2,
             owner=nb2.owner,
             content="foo=1\nbar=foo+foo"
@@ -95,7 +115,7 @@ class TestSearch(TestCase):
         cell2.save()
 
         cell3 = models.Cell(
-            guid=str(uuid.uuid4()).replace("-", ""), 
+            guid=unicode(uuid.uuid4()).replace("-", ""), 
             notebook=nb3,
             owner=nb3.owner,
             content="baz=1\nfump=baz+baz"