Bug 1326174 - Handle cookies with content scope in test_utils.py r=maja_zf
authorHenrik Skupin <mail@hskupin.info>
Thu, 29 Dec 2016 23:40:19 +0100
changeset 327842 2cd1da60be5473e2356281b5855927dfc412fdd3
parent 327841 141fe3b986cd80d7781545b24413462735c76545
child 327843 3e78b4df8dd7470a41c6ec7d7d3042b32026a8da
push id85304
push userphilringnalda@gmail.com
push dateWed, 04 Jan 2017 02:47:06 +0000
treeherdermozilla-inbound@6176579defcb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmaja_zf
bugs1326174
milestone53.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1326174 - Handle cookies with content scope in test_utils.py r=maja_zf Cookie handling should be restricted to content scope and will be enforced with a following patch. This patch fixes the unit test. MozReview-Commit-ID: LpbBMH5refy
testing/firefox-ui/tests/puppeteer/test_utils.py
--- a/testing/firefox-ui/tests/puppeteer/test_utils.py
+++ b/testing/firefox-ui/tests/puppeteer/test_utils.py
@@ -8,17 +8,18 @@ from marionette_harness import Marionett
 
 class TestSanitize(PuppeteerMixin, MarionetteTestCase):
 
     def setUp(self):
         super(TestSanitize, self).setUp()
 
         # Clear all previous history and cookies.
         self.puppeteer.places.remove_all_history()
-        self.marionette.delete_all_cookies()
+        with self.marionette.using_context('content'):
+            self.marionette.delete_all_cookies()
 
         self.urls = [
             'layout/mozilla_projects.html',
             'layout/mozilla.html',
             'layout/mozilla_mission.html',
             'cookies/cookie_single.html'
         ]
         self.urls = [self.marionette.absolute_url(url) for url in self.urls]
@@ -33,11 +34,15 @@ class TestSanitize(PuppeteerMixin, Mario
     def test_sanitize_history(self):
         """ Clears history. """
         self.assertEqual(self.puppeteer.places.get_all_urls_in_history(), self.urls)
         self.puppeteer.utils.sanitize(data_type={"history": True})
         self.assertEqual(self.puppeteer.places.get_all_urls_in_history(), [])
 
     def test_sanitize_cookies(self):
         """ Clears cookies. """
-        self.assertIsNotNone(self.marionette.get_cookie('litmus_1'))
+        with self.marionette.using_context('content'):
+            self.assertIsNotNone(self.marionette.get_cookie('litmus_1'))
+
         self.puppeteer.utils.sanitize(data_type={"cookies": True})
-        self.assertIsNone(self.marionette.get_cookie('litmus_1'))
+
+        with self.marionette.using_context('content'):
+            self.assertIsNone(self.marionette.get_cookie('litmus_1'))