浏览器析构方法

browser/IDriver.py

@@ -1,11 +1,17 @@
 import contextlib
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from selenium.webdriver.remote.webdriver import WebDriver
 
 
 class IDriver():
-    def new_tab(self) -> str:
+    browser: "WebDriver"
-        ...
 
-    def get_current_tab(self) -> str:
+    def __del__(self):
+        self.browser.stop_client()
+
+    def new_tab(self) -> str:
         ...
 
     def change_tab(self, tab_handler: str):
@@ -16,7 +22,7 @@ class IDriver():
 
     @contextlib.contextmanager
     def op_tab(self, tab_handler: str):
-        cur_handle = self.get_current_tab()
+        cur_handle = self.browser.current_window_handle
         if tab_handler == "":
             tab_handler = cur_handle
         try:

browser/chrome.py

@@ -45,9 +45,6 @@ class ChromeDriver(IDriver):
             return
         self.browser.switch_to.window(tab_handler)
 
-    def get_current_tab(self) -> str:
-        return self.browser.current_window_handle
-
     def open_url(self, url: str, tab_handler: str = ""):
         with self.op_tab(tab_handler):
             self.browser.get(url)

browser/edge.py

@@ -38,9 +38,6 @@ class EdgeDriver(IDriver):
                 return _handle
         return ""
 
-    def get_current_tab(self) -> str:
-        return self.browser.current_window_handle
-
     def change_tab(self, tab_handler: str):
         if tab_handler not in self.browser.window_handles:
             return

browser/manager.py

@@ -71,6 +71,9 @@ class BrowserManager():
         if tab_info not in self._tabs:
             self._tabs.append(tab_info)
 
+    def terminate(self):
+        del self._driver
+
 
 class TabInfo(object):
     TAB_TYPE_OTHER = "other"