Add cleanup and refactor.

daspecster · daspecster · commit b806b927bf20 · 2016-06-28T10:04:45.000-04:00
diff --git a/gcloud/test__helpers.py b/gcloud/test__helpers.py
@@ -224,12 +224,12 @@ def test_read_from_cli_info(self):
 
     def test_gae_without_expanduser(self):
         import sys
-        import pwd
-        del pwd
-        sys.modules['pwd'] = None  # Blocks pwd from being imported.
-        project_id = self.callFUT('test-project-id')
-        self.assertEqual(None, project_id)
-        del sys.modules['pwd']  # Unblocks importing of pwd.
+        try:
+            sys.modules['pwd'] = None  # Blocks pwd from being imported.
+            project_id = self.callFUT('test-project-id')
+            self.assertEqual(None, project_id)
+        finally:
+            del sys.modules['pwd']  # Unblocks importing of pwd.
 
     def test_info_value_not_present(self):
         project_id = self.callFUT()
