Microfiber

Merge lp:~akshatj/microfiber/ensure into lp:microfiber

  1. ensure
  2. Merge into trunk
Proposed by Akshat Jain
Status: Merged
Merged at revision: 79
Proposed branch: lp:~akshatj/microfiber/ensure
Merge into: lp:microfiber
Diff against target: 30 lines (+5/-3)
2 files modified
microfiber.py (+3/-1)
test_microfiber.py (+2/-2)
To merge this branch: bzr merge lp:~akshatj/microfiber/ensure
Reviewer Review Type Date Requested Status
Jason Gerard DeRose Approve
Review via email: mp+75082@code.launchpad.net

Description of the change

Fix for Bitesize bug LP #833646

To post a comment you must log in.
Revision history for this message
Jason Gerard DeRose (jderose) wrote :

Looks great, Akshat, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'microfiber.py'
2--- microfiber.py 2011-08-31 08:34:48 +0000
3+++ microfiber.py 2011-09-12 22:10:26 +0000
4@@ -702,8 +702,10 @@
5 """
6 try:
7 self.put(None)
8+ return True
9+
10 except PreconditionFailed:
11- pass
12+ return False
13
14 def save(self, doc):
15 """
16
17=== modified file 'test_microfiber.py'
18--- test_microfiber.py 2011-08-31 08:34:48 +0000
19+++ test_microfiber.py 2011-09-12 22:10:26 +0000
20@@ -764,9 +764,9 @@
21 def test_ensure(self):
22 inst = self.klass(self.db, self.env)
23 self.assertRaises(NotFound, inst.get)
24- self.assertIsNone(inst.ensure())
25+ self.assertTrue(inst.ensure())
26 self.assertEqual(inst.get()['db_name'], self.db)
27- self.assertIsNone(inst.ensure())
28+ self.assertFalse(inst.ensure())
29 self.assertEqual(inst.delete(), {'ok': True})
30 self.assertRaises(NotFound, inst.get)
31

Subscribers

People subscribed via source and target branches

to all changes: