Moved temporary directory deletion to finally block in

BrowserManagerHandle.close_browser_manager.

Author: ndanner-wesleyancs

openwpm/browser_manager.py

@@ -358,22 +358,6 @@ def close_browser_manager(self, force: bool = False) -> None:
                     )
                     return
 
-                # Delete the temporary directory used by geckodriver.
-                try:
-                    self.logger.debug(
-                        "BROWSER %i: deleting temp dir %s" %
-                        (self.browser_params.browser_id, 
-                            self.browser_params.tmpdir)
-                    )
-                    shutil.rmtree(self.browser_params.tmpdir)
-                    self.browser_params.tmpdir = None
-                except Exception as e:
-                    self.logger.warn(
-                        "BROWSER %i: failed to delete temp dir %s: %s" %
-                        (self.browser_params.browser_id, 
-                            self.browser_params.tmpdir,
-                            str(e))
-                )
                 self.logger.debug(
                     "BROWSER %i: Browser manager closed successfully." % self.browser_id
                 )
@@ -382,6 +366,23 @@ def close_browser_manager(self, force: bool = False) -> None:
             if not shutdown_complete:
                 self.kill_browser_manager()
 
+            # Delete the temporary directory used by geckodriver.
+            try:
+                self.logger.debug(
+                    "BROWSER %i: deleting temp dir %s" %
+                    (self.browser_params.browser_id, 
+                        self.browser_params.tmpdir)
+                )
+                shutil.rmtree(self.browser_params.tmpdir)
+                self.browser_params.tmpdir = None
+            except Exception as e:
+                self.logger.warn(
+                    "BROWSER %i: failed to delete temp dir %s: %s" %
+                    (self.browser_params.browser_id, 
+                        self.browser_params.tmpdir,
+                        str(e))
+                )
+
     def execute_command_sequence(
         self,
         # Quoting to break cyclic import, see https://stackoverflow.com/a/39757388