Attempt to remove Firefox profile when using Marionette

akeyz · May 18, 2016 · 5b85c32 · 5b85c32
1 parent 803c43a
commit 5b85c32
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/py/selenium/webdriver/firefox/webdriver.py b/py/selenium/webdriver/firefox/webdriver.py
@@ -99,12 +99,12 @@ def quit(self):
             self.service.stop()
         else:
             self.binary.kill()
-            try:
-                shutil.rmtree(self.profile.path)
-                if self.profile.tempfolder is not None:
-                    shutil.rmtree(self.profile.tempfolder)
-            except Exception as e:
-                print(str(e))
+        try:
+            shutil.rmtree(self.profile.path)
+            if self.profile.tempfolder is not None:
+                shutil.rmtree(self.profile.tempfolder)
+        except Exception as e:
+            print(str(e))
 
     @property
     def firefox_profile(self):

diff --git a/py/test/selenium/webdriver/firefox/mn_profile_tests.py b/py/test/selenium/webdriver/firefox/mn_profile_tests.py
@@ -15,6 +15,8 @@
 # specific language governing permissions and limitations
 # under the License.
 
+import os
+
 import pytest
 from selenium import webdriver
 from selenium.webdriver.common.desired_capabilities import DesiredCapabilities
@@ -47,3 +49,9 @@ def profile():
 
 def test_profile_is_used(driver):
     assert 'about:' == driver.current_url
+
+
+def test_profile_is_deleted(driver, profile):
+    assert os.path.exists(profile.path)
+    driver.quit()
+    assert not os.path.exists(profile.path)