error-handling: improve use of context manager

cmccandless · cmccandless · commit 68b8f22c75fb · 2017-10-21T11:08:01.000-05:00
diff --git a/exercises/error-handling/error_handling_test.py b/exercises/error-handling/error_handling_test.py
@@ -6,18 +6,26 @@
 class FileLike(object):
     def __init__(self):
         self.is_open = False
+        self.was_open = False
+        self.did_something = False
 
     def open(self):
-        self.is_open = True
-
-    def __enter__(self):
+        self.was_open = False
         self.is_open = True
 
     def close(self):
         self.is_open = False
+        self.was_open = True
+
+    def __enter__(self):
+        self.open()
 
     def __exit__(self):
-        self.is_open = False
+        self.close()
+
+    def do_something(self):
+        self.did_something = True
+        raise Exception()
 
 
 class ErrorHandlingTest(unittest.TestCase):
@@ -45,7 +53,12 @@ def test_filelike_objects_are_closed_on_exception(self):
         filelike_object.open()
         with self.assertRaises(Exception):
             er.filelike_objects_are_closed_on_exception(filelike_object)
-        self.assertFalse(filelike_object.is_open)
+        self.assertFalse(filelike_object.is_open,
+                         'filelike_object should be closed')
+        self.assertTrue(filelike_object.was_open,
+                        'filelike_object should have been opened')
+        self.assertTrue(filelike_object.did_something,
+                        'filelike_object should call did_something()')
 
 
 if __name__ == '__main__':
diff --git a/exercises/error-handling/example.py b/exercises/error-handling/example.py
@@ -18,5 +18,8 @@ def handle_error_by_returning_tuple(input_data):
 
 def filelike_objects_are_closed_on_exception(filelike_object):
     with filelike_object:
-        filelike_object.close()
-        raise Exception()
+        try:
+            filelike_object.do_something()
+        except Exception:
+            filelike_object.close()
+            raise
