Removed vestigial exception and added final unit test

pjkundert · Jan 18, 2013 · 03fe214 · 03fe214
1 parent 100d2e8
commit 03fe214
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/paxos/durable.py b/paxos/durable.py
@@ -68,8 +68,6 @@ class HashMismatch (FileCorrupted):
 class FileTruncated (FileCorrupted):
     pass
 
-class PickleCorrupted (FileCorrupted):
-    pass
 
 
 def read( fd ):
@@ -103,10 +101,8 @@ def read( fd ):
     if not m.digest() == md5hash:
         raise HashMismatch()
 
-    try:
-        return serial_number, pickle.loads(data3)
-    except:
-        raise PickleCorrupted()
+    return serial_number, pickle.loads(data3)
+
 
 
 def write( fd, serial_number, pyobject ):

diff --git a/test/test_durable.py b/test/test_durable.py
@@ -100,6 +100,11 @@ def newdoh(self, obj_id=None):
         self.dohs.append(doh)
         return doh
 
+
+    def test_bad_directory(self):
+        self.assertRaises(Exception, durable.DurableObjectHandler, '/@#$!$^FOOBARBAZ', 'blah')
+
+
     def test_no_save(self):
         self.doh.close()
         d = self.newdoh('id1')