Handle cleanup of proxy zip file between test runs

Author: mdmintz

seleniumbase/plugins/pytest_plugin.py

@@ -3,6 +3,7 @@
 import optparse
 import pytest
 from seleniumbase.core import log_helper
+from seleniumbase.core import proxy_helper
 from seleniumbase.fixtures import constants
 
 
@@ -84,6 +85,7 @@ def pytest_addoption(parser):
                      default=None,
                      help="""Designates the proxy server:port to use.
                           Format: servername:port.  OR
+                                  username:password@servername:port  OR
                                   A dict key from proxy_list.PROXY_LIST
                           Default: None.""")
     parser.addoption('--headless', action="store_true",
@@ -138,11 +140,12 @@ def pytest_configure(config):
     if with_testing_base:
         log_path = config.getoption('log_path')
         log_helper.log_folder_setup(log_path)
+    proxy_helper.remove_proxy_zip_if_present()
 
 
 def pytest_unconfigure():
-    """ This runs after all tests have completed with pytest """
-    pass
+    """ This runs after all tests have completed with pytest. """
+    proxy_helper.remove_proxy_zip_if_present()
 
 
 def pytest_runtest_setup():

seleniumbase/plugins/selenium_plugin.py

@@ -5,6 +5,7 @@
 
 from nose.plugins import Plugin
 from pyvirtualdisplay import Display
+from seleniumbase.core import proxy_helper
 from seleniumbase.fixtures import constants
 
 
@@ -62,6 +63,7 @@ def options(self, parser, env):
             default=None,
             help="""Designates the proxy server:port to use.
                     Format: servername:port.  OR
+                            username:password@servername:port  OR
                             A dict key from proxy_list.PROXY_LIST
                     Default: None.""")
         parser.add_option(
@@ -116,6 +118,7 @@ def configure(self, options, conf):
         self.enabled = True  # Used if test class inherits BaseCase
         self.options = options
         self.headless_active = False  # Default setting
+        proxy_helper.remove_proxy_zip_if_present()
 
     def beforeTest(self, test):
         test.test.browser = self.options.browser
@@ -142,6 +145,10 @@ def beforeTest(self, test):
         self.driver = None
         test.test.driver = self.driver
 
+    def finalize(self, result):
+        """ This runs after all tests have completed with nosetests. """
+        proxy_helper.remove_proxy_zip_if_present()
+
     def afterTest(self, test):
         try:
             # If the browser window is still open, close it now.