Merge pull request #20 from scivisum/task/RD-36214_memory_leak

Task/rd 36214 memory leak

Author: matseymour28590

browserdebuggertools/chrome/interface.py

@@ -67,17 +67,6 @@ def get_result(self, result_id):
           """
         return self._socket_handler.find_result(result_id)
 
-    def get_results(self):
-        """ Retrieves a dictionary containing all the results indexed by result_id
-        """
-        self._socket_handler.flush_messages()
-        return self._socket_handler.results
-
-    def clear_results(self):
-        """ Clears all results in the cache
-        """
-        self._socket_handler.results.clear()
-
     def get_events(self, domain, clear=False):
         """ Retrieves all events for a given domain
           :param domain: The domain to get the events for.
@@ -104,16 +93,6 @@ def execute(self, domain, method, args=None):
 
         return self.wait_for_result(result_id)
 
-    def execute_async(self, domain, method, args=None):
-        """ Same as execute but doesn't wait for the result.
-
-        :param domain: chrome devtools protocol domain
-        :param method: domain specific method.
-        :param args: parameters to be executed
-        :return: id of the request
-        """
-        return self._socket_handler.execute("{}.{}".format(domain, method), args)
-
     def enable_domain(self, domain):
         """ Enables notifications for the given domain.
         """
@@ -149,7 +128,7 @@ def set_timeout(self, value):
     def navigate(self, url):
         """ Navigates to the given url asynchronously
         """
-        return self.execute_async("Page", "navigate", {
+        return self.execute("Page", "navigate", {
             "url": url
         })
 

browserdebuggertools/sockethandler.py

@@ -70,7 +70,7 @@ def find_result(self, result_id):
         if result_id not in self.results:
             raise ResultNotFoundError("Result not found for id: {} .".format(result_id))
 
-        return self.results[result_id]
+        return self.results.pop(result_id)
 
     def execute(self, method, params):
         self._next_result_id += 1

setup.py

@@ -11,7 +11,7 @@
 
 setup(
     name="browserdebuggertools",
-    version="3.2.0",
+    version="4.0.0",
     packages=PACKAGES,
     install_requires=requires,
     license="GNU General Public License v3",

tests/e2etests/chrome/test_interface.py

@@ -151,17 +151,15 @@ class ChromeInterface_get_document_readystate(object):
 
     def test_get_ready_state_dom_complete(self):
 
-        result_id = self.devtools_client.navigate(url="http://localhost:%s" % self.testSite.port)
-        self.devtools_client.wait_for_result(result_id)
+        self.devtools_client.navigate(url="http://localhost:%s" % self.testSite.port)
         self._assert_dom_complete()
         self.assertEqual("complete", self.devtools_client.get_document_readystate())
 
     def test_take_screenshot_incomplete_main_exchange(self):
         self.devtools_client.navigate(
             url="http://localhost:%s?main_exchange_response_time=10" % self.testSite.port
         )
-        result_id = self.devtools_client.navigate(url="http://localhost:%s" % self.testSite.port)
-        self.devtools_client.wait_for_result(result_id)
+        self.devtools_client.navigate(url="http://localhost:%s" % self.testSite.port)
         self._assert_dom_complete()
         self.assertEqual("complete", self.devtools_client.get_document_readystate())
 
@@ -213,10 +211,8 @@ def test_took_expected_time(self):
         self.devtools_client.emulate_network_conditions(1, download, upload)
 
         # Page has a default of 1 megabyte response body
-        result_id = self.devtools_client.navigate(url="http://localhost:%s/big_body"
-                                                      % self.testSite.port)
-        self.devtools_client.wait_for_result(result_id)
-
+        self.devtools_client.navigate(url="http://localhost:%s/big_body"
+                                      % self.testSite.port)
         self.assertTrue(self.waitForEventWithMethod("Network.responseReceived"))
         # We have received the response header, now measure how long it takes to download the
         # response body. It should take approximately 10 seconds.