Bug 925469 - Import errors in __init__.py, r=dburns

testing/marionette/client/marionette/__init__.py

@@ -11,3 +11,4 @@ from runtests import MarionetteTestResult
 from runtests import MarionetteTestRunner
 from runtests import MarionetteTestOptions
 from runtests import MarionetteTextTestRunner
+from errors import *

testing/marionette/client/marionette/tests/unit/test_clearing.py

@@ -3,7 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 from marionette_test import MarionetteTestCase
-from errors import InvalidElementStateException
+from marionette import InvalidElementStateException
 
 class TestClear(MarionetteTestCase):
     def testWriteableTextInputShouldClear(self):

testing/marionette/client/marionette/tests/unit/test_element_touch.py

@@ -3,7 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 from marionette_test import MarionetteTestCase
-from errors import MarionetteException
+from marionette import MarionetteException
 
 class testElementTouch(MarionetteTestCase):
     def test_touch(self):

testing/marionette/client/marionette/tests/unit/test_emulator.py

@@ -3,7 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 from marionette_test import MarionetteTestCase
-from errors import JavascriptException, MarionetteException
+from marionette import JavascriptException, MarionetteException
 
 
 class TestEmulatorContent(MarionetteTestCase):

testing/marionette/client/marionette/tests/unit/test_execute_async_script.py

@@ -3,7 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 from marionette_test import MarionetteTestCase
-from errors import JavascriptException, MarionetteException, ScriptTimeoutException
+from marionette import JavascriptException, MarionetteException, ScriptTimeoutException
 import time
 
 

testing/marionette/client/marionette/tests/unit/test_execute_isolate.py

@@ -3,7 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 from marionette_test import MarionetteTestCase, skip_if_b2g
-from errors import JavascriptException, MarionetteException, ScriptTimeoutException
+from marionette import JavascriptException, MarionetteException, ScriptTimeoutException
 
 class TestExecuteIsolationContent(MarionetteTestCase):
     def setUp(self):

testing/marionette/client/marionette/tests/unit/test_execute_script.py

@@ -3,7 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 from marionette_test import MarionetteTestCase
-from errors import JavascriptException, MarionetteException
+from marionette import JavascriptException, MarionetteException
 
 class TestExecuteContent(MarionetteTestCase):
     def test_stack_trace(self):

testing/marionette/client/marionette/tests/unit/test_findelement.py

@@ -5,7 +5,7 @@
 from marionette_test import MarionetteTestCase
 from marionette import HTMLElement
 from by import By
-from errors import NoSuchElementException
+from marionette import NoSuchElementException
 
 
 class TestElements(MarionetteTestCase):

testing/marionette/client/marionette/tests/unit/test_findelement_chrome.py

@@ -5,7 +5,7 @@
 from marionette_test import MarionetteTestCase
 from marionette import HTMLElement
 from by import By
-from errors import NoSuchElementException
+from marionette import NoSuchElementException
 
 
 class TestElementsChrome(MarionetteTestCase):

testing/marionette/client/marionette/tests/unit/test_implicit_waits.py

@@ -3,7 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 from marionette_test import MarionetteTestCase
-from errors import NoSuchElementException
+from marionette import NoSuchElementException
 
 class TestImplicitWaits(MarionetteTestCase):
     def testShouldImplicitlyWaitForASingleElement(self):

testing/marionette/client/marionette/tests/unit/test_navigation.py

@@ -3,8 +3,8 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 from marionette_test import MarionetteTestCase
-from errors import MarionetteException
-from errors import TimeoutException
+from marionette import MarionetteException
+from marionette import TimeoutException
 
 class TestNavigate(MarionetteTestCase):
     def test_navigate(self):

testing/marionette/client/marionette/tests/unit/test_simpletest_sanity.py

@@ -3,7 +3,7 @@
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
 from marionette_test import MarionetteTestCase
-from errors import JavascriptException, MarionetteException, ScriptTimeoutException
+from marionette import JavascriptException, MarionetteException, ScriptTimeoutException
 
 class SimpletestSanityTest(MarionetteTestCase):
 

testing/marionette/client/marionette/tests/unit/test_single_finger.py

@@ -4,7 +4,7 @@
 
 from marionette_test import MarionetteTestCase
 from marionette import Actions
-from errors import MarionetteException
+from marionette import MarionetteException
 #add this directory to the path
 import os
 import sys

testing/marionette/client/marionette/tests/unit/test_single_finger_desktop.py

@@ -1,6 +1,6 @@
 from marionette_test import MarionetteTestCase
 from marionette import Actions
-from errors import MarionetteException
+from marionette import MarionetteException
 #add this directory to the path
 import os
 import sys

testing/marionette/client/marionette/tests/unit/test_specialpowers.py

@@ -3,7 +3,7 @@
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
 from marionette_test import MarionetteTestCase
-from errors import JavascriptException, MarionetteException
+from marionette import JavascriptException, MarionetteException
 
 class TestSpecialPowersContent(MarionetteTestCase):
 

testing/marionette/client/marionette/tests/unit/test_switch_frame.py

@@ -4,7 +4,7 @@
 
 import os
 from marionette_test import MarionetteTestCase
-from errors import JavascriptException
+from marionette import JavascriptException
 
 # boiler plate for the initial navigation and frame switch
 def switch_to_window_verify(test, start_url, frame, verify_title, verify_url):

testing/marionette/client/marionette/tests/unit/test_switch_frame_b2g.py

@@ -3,7 +3,7 @@
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
 from marionette_test import MarionetteTestCase
-from errors import *
+from marionette import *
 
 class TestGaiaLaunch(MarionetteTestCase):
     """Trivial example of launching a Gaia app, entering its context and performing some test on it.

testing/marionette/client/marionette/tests/unit/test_switch_frame_chrome.py

@@ -3,7 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 from marionette_test import MarionetteTestCase
-from errors import JavascriptException
+from marionette import JavascriptException
 
 class TestSwitchFrameChrome(MarionetteTestCase):
     def setUp(self):

testing/marionette/client/marionette/tests/unit/test_timeouts.py

@@ -5,7 +5,7 @@
 import os
 from marionette_test import MarionetteTestCase
 from marionette import HTMLElement
-from errors import NoSuchElementException, JavascriptException, MarionetteException, ScriptTimeoutException
+from marionette import NoSuchElementException, JavascriptException, MarionetteException, ScriptTimeoutException
 
 class TestTimeouts(MarionetteTestCase):
     def test_pagetimeout_notdefinetimeout_pass(self):

testing/marionette/client/marionette/tests/unit/test_typing.py

@@ -4,7 +4,7 @@
 
 from marionette_test import MarionetteTestCase
 from keys import Keys
-from errors import ElementNotVisibleException
+from marionette import ElementNotVisibleException
 
 
 class TestTyping(MarionetteTestCase):