summaryrefslogtreecommitdiff
path: root/service/test/adapter
diff options
context:
space:
mode:
authorPatrick Maia <pmaia@thoughtworks.com>2014-09-08 01:35:59 +0000
committerPatrick Maia <pmaia@thoughtworks.com>2014-09-08 01:35:59 +0000
commitb6b6a9a5c39dd656b7819038bb05892c6d5bd3d1 (patch)
tree1bcf5f0d23cf153167c2d69d6c3005e53a9c570b /service/test/adapter
parent9d8e75ba25fcb39e98a49c3ab6e81759d6d468e4 (diff)
#51 - reuses dbm instances between TagIndex instances if the dbm instances are using the same file
Diffstat (limited to 'service/test/adapter')
-rw-r--r--service/test/adapter/pixelated_mailbox_test.py3
-rw-r--r--service/test/adapter/tag_index_test.py5
2 files changed, 4 insertions, 4 deletions
diff --git a/service/test/adapter/pixelated_mailbox_test.py b/service/test/adapter/pixelated_mailbox_test.py
index 7e8e9d3c..72e6141d 100644
--- a/service/test/adapter/pixelated_mailbox_test.py
+++ b/service/test/adapter/pixelated_mailbox_test.py
@@ -28,6 +28,7 @@ class TestPixelatedMailbox(unittest.TestCase):
self.db_file_path = '/tmp/test_tags'
def tearDown(self):
+ TagIndex(self.db_file_path)._close_db()
os.remove(self.db_file_path + '.db')
def test_special_tags_always_exists(self):
@@ -38,7 +39,6 @@ class TestPixelatedMailbox(unittest.TestCase):
tag_index = TagIndex(self.db_file_path)
tag_index.set(Tag('one_tag'))
tag_index.set(Tag('two_tag'))
- tag_index.close_db()
mailbox = PixelatedMailbox(test_helper.leap_mailbox(), self.db_file_path)
expected_tags = set([Tag('one_tag'), Tag('two_tag')]).union(mailbox.SPECIAL_TAGS)
self.assertEquals(expected_tags, mailbox.all_tags())
@@ -48,7 +48,6 @@ class TestPixelatedMailbox(unittest.TestCase):
tag = Tag('one_tag')
tag.increment(12)
tag_index.set(tag)
- tag_index.close_db()
mailbox = PixelatedMailbox(test_helper.leap_mailbox(), self.db_file_path)
self.assertEquals(0, mailbox.tag_index.get('inbox').total)
self.assertEquals(1, mailbox.tag_index.get('one_tag').total)
diff --git a/service/test/adapter/tag_index_test.py b/service/test/adapter/tag_index_test.py
index 515c9571..21564fc5 100644
--- a/service/test/adapter/tag_index_test.py
+++ b/service/test/adapter/tag_index_test.py
@@ -16,6 +16,7 @@
# along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
import unittest
import os
+import uuid
from pixelated.adapter.tag_index import TagIndex
from pixelated.adapter.tag import Tag
@@ -24,11 +25,11 @@ from pixelated.adapter.tag import Tag
class TestTagIndex(unittest.TestCase):
def setUp(self):
- self.db_path = '/tmp/database_test_tag_index'
+ self.db_path = '/tmp/test_tag_index_' + str(uuid.uuid4())
self.tag_index = TagIndex(self.db_path)
def tearDown(self):
- self.tag_index.close_db()
+ self.tag_index._close_db()
os.remove(self.db_path + '.db')
def test_get_and_set_works(self):