Bug 1107336: Update loop tests to use new Marionette Driver; r=jgriffin

This commit is contained in:
David Burns 2015-02-23 14:42:17 +00:00
parent e3b6fa311e
commit af7f7ee757
2 changed files with 12 additions and 6 deletions

View File

@ -1,12 +1,18 @@
from marionette_test import MarionetteTestCase
from by import By
import urlparse
from errors import NoSuchElementException, StaleElementException
# noinspection PyUnresolvedReferences
from wait import Wait
try:
from by import By
from errors import NoSuchElementException, StaleElementException
# noinspection PyUnresolvedReferences
from wait import Wait
except ImportError:
from marionette_driver.by import By
from marionette_driver.errors import NoSuchElementException, StaleElementException
# noinspection PyUnresolvedReferences
from marionette_driver import Wait
import os
import sys
import urlparse
sys.path.insert(1, os.path.dirname(os.path.abspath(__file__)))
import pyperclip

View File

@ -1,5 +1,5 @@
from marionette_test import MarionetteTestCase
from errors import NoSuchElementException
from marionette_driver.errors import NoSuchElementException
import threading
import SimpleHTTPServer
import SocketServer