Bug 1137122 - Bump dependency for marionette-client to v0.9. r=automatedtester

firefox_puppeteer/__init__.py

@@ -4,7 +4,7 @@
 
 import os
 
-from marionette import HTMLElement
+from marionette_driver.marionette import HTMLElement
 
 from .decorators import use_class_as_property
 

firefox_puppeteer/api/keys.py

@@ -2,10 +2,10 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-import marionette
+import marionette_driver
 
 
-class Keys(marionette.keys.Keys):
+class Keys(marionette_driver.keys.Keys):
     """Proxy to marionette's keys with an "accel" provided for convenience
     testing across platforms."""
 

firefox_puppeteer/api/l10n.py

@@ -4,7 +4,7 @@
 
 import copy
 
-from marionette.errors import MarionetteException
+from marionette_driver.errors import MarionetteException
 
 from ..base import BaseLib
 

firefox_puppeteer/api/places.py

@@ -4,7 +4,7 @@
 
 from collections import namedtuple
 
-from marionette.errors import TimeoutException
+from marionette_driver.errors import TimeoutException
 
 from ..base import BaseLib
 

firefox_puppeteer/api/prefs.py

@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-from marionette.errors import MarionetteException
+from marionette_driver.errors import MarionetteException
 
 from ..base import BaseLib
 

firefox_puppeteer/errors.py

@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-from marionette.errors import MarionetteException
+from marionette_driver.errors import MarionetteException
 
 
 class NoCertificateError(MarionetteException):

firefox_puppeteer/tests/test_appinfo.py

@@ -3,7 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 import mozversion
-from marionette.errors import MarionetteException
+from marionette_driver.errors import MarionetteException
 
 from firefox_ui_harness.testcase import FirefoxTestCase
 

firefox_puppeteer/tests/test_l10n.py

@@ -2,8 +2,8 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-from marionette import By
-from marionette.errors import MarionetteException
+from marionette_driver import By
+from marionette_driver.errors import MarionetteException
 
 from firefox_puppeteer.api.l10n import L10n
 from firefox_ui_harness.decorators import skip_if_e10s

firefox_puppeteer/tests/test_menubar.py

@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-from marionette.errors import NoSuchElementException
+from marionette_driver.errors import NoSuchElementException
 
 from firefox_ui_harness.testcase import FirefoxTestCase
 

firefox_puppeteer/tests/test_places.py

@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-from marionette import By
+from marionette_driver import By
 
 from firefox_ui_harness.testcase import FirefoxTestCase
 

firefox_puppeteer/tests/test_prefs.py

@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-from marionette.errors import MarionetteException
+from marionette_driver.errors import MarionetteException
 
 from firefox_ui_harness.testcase import FirefoxTestCase
 

firefox_puppeteer/tests/test_toolbars.py

@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-from marionette.errors import NoSuchElementException
+from marionette_driver.errors import NoSuchElementException
 
 from firefox_ui_harness.decorators import skip_under_xvfb
 from firefox_ui_harness.testcase import FirefoxTestCase

firefox_puppeteer/tests/test_windows.py

@@ -2,8 +2,8 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-from marionette import By
-from marionette.errors import NoSuchWindowException
+from marionette_driver import By
+from marionette_driver.errors import NoSuchWindowException
 
 import firefox_puppeteer.errors as errors
 

firefox_puppeteer/ui/menu.py

@@ -2,8 +2,8 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-from marionette import By
-from marionette.errors import NoSuchElementException
+from marionette_driver import By
+from marionette_driver.errors import NoSuchElementException
 
 from ..base import BaseLib
 from .. import DOMElement

firefox_puppeteer/ui/tabbar.py

@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-from marionette import (
+from marionette_driver import (
     By, Wait
 )
 
-from marionette.errors import NoSuchElementException
+from marionette_driver.errors import NoSuchElementException
 
 import firefox_puppeteer.errors as errors
 

firefox_puppeteer/ui/toolbars.py

@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-from marionette import Wait, By
+from marionette_driver import Wait, By
 
 from ..api.keys import Keys
 from ..api.l10n import L10n

firefox_puppeteer/ui/windows.py

@@ -4,9 +4,9 @@
 
 from time import sleep
 
-from marionette import By, Wait
-from marionette.errors import NoSuchWindowException
-from marionette.keys import Keys
+from marionette_driver import By, Wait
+from marionette_driver.errors import NoSuchWindowException
+from marionette_driver.keys import Keys
 
 import firefox_puppeteer.errors as errors
 

firefox_ui_tests/functional/locationbar/test_suggest_bookmarks.py

@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-from marionette import By
+from marionette_driver import By
 
 from firefox_ui_harness.decorators import skip_under_xvfb
 from firefox_ui_harness.testcase import FirefoxTestCase

firefox_ui_tests/functional/private_browsing/test_about_private_browsing.py

@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-from marionette import By
+from marionette_driver import By
 
 from firefox_ui_harness.decorators import skip_if_e10s
 from firefox_ui_harness.testcase import FirefoxTestCase

firefox_ui_tests/remote/security/test_security_notification.py

@@ -4,8 +4,8 @@
 
 import time
 
-from marionette import By
-from marionette.errors import MarionetteException
+from marionette_driver import By
+from marionette_driver.errors import MarionetteException
 
 from firefox_ui_harness.testcase import FirefoxTestCase
 

firefox_ui_tests/remote/security/test_unknown_issuer.py

@@ -4,8 +4,8 @@
 
 import time
 
-from marionette import By
-from marionette.errors import MarionetteException
+from marionette_driver import By
+from marionette_driver.errors import MarionetteException
 
 from firefox_ui_harness.testcase import FirefoxTestCase
 

setup.py

@@ -4,10 +4,10 @@
 
 from setuptools import setup, find_packages
 
-PACKAGE_VERSION = '0.1'
+PACKAGE_VERSION = '0.2'
 
 deps = [
-    'marionette-client == 0.8.7',
+    'marionette-client == 0.9',
 ]
 
 setup(name='firefox-ui-tests',