Bug 1201050: Part 2: Unbreak test by using correct imports
authorAndreas Tolfsen <ato@mozilla.com>
Wed, 02 Sep 2015 14:04:10 +0100
changeset 274360 238dd6c3aef79b5aa530312c6b6762099e7d7eed
parent 274359 ba8cd968866afa4578f1ec2d52d31d8e0753d81a
child 274361 25ee0b9f4a4998eaafe6b220634c3d9aab8a8a28
push id68547
push useratolfsen@mozilla.com
push dateThu, 26 Nov 2015 16:24:33 +0000
treeherdermozilla-inbound@1f2b651a5d29 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1201050
milestone45.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 1201050: Part 2: Unbreak test by using correct imports Do note that this test is disabeld in the manifest. r=dburns
testing/marionette/client/marionette/tests/unit/test_multi_finger.py
--- a/testing/marionette/client/marionette/tests/unit/test_multi_finger.py
+++ b/testing/marionette/client/marionette/tests/unit/test_multi_finger.py
@@ -1,14 +1,14 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # 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 MarionetteTestCase
-from marionette.marionette import MultiActions, Actions
+from marionette_driver.marionette import MultiActions, Actions
 
 class testMultiFinger(MarionetteTestCase):
     def test_move_element(self):
       testAction = self.marionette.absolute_url("testAction.html")
       self.marionette.navigate(testAction)
       start = self.marionette.find_element("id", "button1")
       drop = self.marionette.find_element("id", "button2")
       ele = self.marionette.find_element("id", "button3")