summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAurélien Bompard <aurelien@bompard.org>2013-05-18 16:25:02 +0200
committerAurélien Bompard <aurelien@bompard.org>2013-05-18 16:26:49 +0200
commit275ea88aac4df63697d65bcd683b625df8d5201f (patch)
treedef456bdb3eaea8f436eb40624d6fb26e9afc902
parent44259cc6b838cdc32aebab98bf8ab6f4123f519b (diff)
downloadkittystore-275ea88aac4df63697d65bcd683b625df8d5201f.tar.gz
kittystore-275ea88aac4df63697d65bcd683b625df8d5201f.tar.xz
kittystore-275ea88aac4df63697d65bcd683b625df8d5201f.zip
Fix unit tests after last commit
-rw-r--r--kittystore/import.py2
-rw-r--r--kittystore/storm/schema/patch_7.py2
-rw-r--r--kittystore/test/__init__.py2
-rw-r--r--kittystore/test/test_storm_store.py8
-rw-r--r--kittystore/test/test_storm_store_fetch.py4
5 files changed, 9 insertions, 9 deletions
diff --git a/kittystore/import.py b/kittystore/import.py
index e9414d5..34efa22 100644
--- a/kittystore/import.py
+++ b/kittystore/import.py
@@ -88,7 +88,7 @@ class DummyMailingList(object):
def __init__(self, address):
self.fqdn_listname = unicode(address)
self.display_name = None
- self.description = None
+ self.subject_prefix = None
class DownloadError(Exception): pass
diff --git a/kittystore/storm/schema/patch_7.py b/kittystore/storm/schema/patch_7.py
index 7eb3325..9607d1d 100644
--- a/kittystore/storm/schema/patch_7.py
+++ b/kittystore/storm/schema/patch_7.py
@@ -25,7 +25,7 @@ SQL = {
def apply(store):
- """Add the thread table"""
+ """Add the subject_prefix column and delete the description column"""
dbtype = get_db_type(store)
for statement in SQL[dbtype]:
store.execute(statement)
diff --git a/kittystore/test/__init__.py b/kittystore/test/__init__.py
index b6833aa..4250b59 100644
--- a/kittystore/test/__init__.py
+++ b/kittystore/test/__init__.py
@@ -14,6 +14,6 @@ class FakeList(object):
def __init__(self, name):
self.fqdn_listname = name
self.display_name = None
- self.description = None
+ self.subject_prefix = None
diff --git a/kittystore/test/test_storm_store.py b/kittystore/test/test_storm_store.py
index d4fa464..7ff7faa 100644
--- a/kittystore/test/test_storm_store.py
+++ b/kittystore/test/test_storm_store.py
@@ -82,17 +82,17 @@ class TestStormStore(unittest.TestCase):
msg.set_payload("Dummy message")
ml = FakeList("example-list")
ml.display_name = u"name 1"
- ml.description = u"desc 1"
+ ml.subject_prefix = u"[prefix 1]"
self.store.add_to_list(ml, msg)
ml_db = self.store.db.find(List).one()
self.assertEqual(ml_db.display_name, "name 1")
- self.assertEqual(ml_db.description, "desc 1")
+ self.assertEqual(ml_db.subject_prefix, "[prefix 1]")
ml.display_name = u"name 2"
- ml.description = u"desc 2"
+ ml.subject_prefix = u"[prefix 2]"
self.store.add_to_list(ml, msg)
ml_db = self.store.db.find(List).one()
self.assertEqual(ml_db.display_name, "name 2")
- self.assertEqual(ml_db.description, "desc 2")
+ self.assertEqual(ml_db.subject_prefix, "[prefix 2]")
def test_thread_neighbors(self):
diff --git a/kittystore/test/test_storm_store_fetch.py b/kittystore/test/test_storm_store_fetch.py
index 273c715..2ee4faf 100644
--- a/kittystore/test/test_storm_store_fetch.py
+++ b/kittystore/test/test_storm_store_fetch.py
@@ -29,7 +29,7 @@ class TestStormStoreFetch(unittest.TestCase):
ml = FakeList("example-list")
ml.display_name = u"name 1"
- ml.description = u"desc 1"
+ ml.subject_prefix = u"[prefix 1]"
return ml.fqdn_listname, self.store.add_to_list(ml, msg)
@@ -83,4 +83,4 @@ class TestStormStoreFetch(unittest.TestCase):
"""Search for a Message in a List by Content or Subject. Match for Content"""
email = self.store.search_list_for_content_subject(self.listname, "Message").one()
self.assertIsNotNone(email)
- self.assertEqual(email.sender_email, "dummy@example.com") \ No newline at end of file
+ self.assertEqual(email.sender_email, "dummy@example.com")