Bug 1285240: Update tests to prevent redefinitions r=ato
authorDavid Burns <dburns@mozilla.com>
Thu, 07 Jul 2016 22:20:32 +0100
changeset 304120 0ac60b8ebc497f4731bca30373a2ef486bf5091c
parent 304119 5e7d0a3aab628a5912f23a95aaff81c51eed9659
child 304197 590b6cdf1e9950dd60f9c10d91a6edfad4e787a1
push id30512
push userdburns@mozilla.com
push dateFri, 08 Jul 2016 09:28:47 +0000
treeherderautoland@0ac60b8ebc49 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersato
bugs1285240
milestone50.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 1285240: Update tests to prevent redefinitions r=ato The tests had the same name which caused a redefinition meaning only one of the tests was run. MozReview-Commit-ID: LuflhcD4wKl
testing/marionette/harness/marionette/tests/unit/test_element_retrieval.py
--- a/testing/marionette/harness/marionette/tests/unit/test_element_retrieval.py
+++ b/testing/marionette/harness/marionette/tests/unit/test_element_retrieval.py
@@ -142,30 +142,30 @@ class TestFindElementHTML(MarionetteTest
         self.assertRaises(NoSuchElementException, self.marionette.find_element, By.CSS_SELECTOR, "cheese")
         self.assertRaises(NoSuchElementException, self.marionette.find_element, By.ID, "cheese")
         self.assertRaises(NoSuchElementException, self.marionette.find_element, By.LINK_TEXT, "cheese")
         self.assertRaises(NoSuchElementException, self.marionette.find_element, By.NAME, "cheese")
         self.assertRaises(NoSuchElementException, self.marionette.find_element, By.PARTIAL_LINK_TEXT, "cheese")
         self.assertRaises(NoSuchElementException, self.marionette.find_element, By.TAG_NAME, "cheese")
         self.assertRaises(NoSuchElementException, self.marionette.find_element, By.XPATH, "cheese")
 
-    def test_not_found(self):
+    def test_not_found_from_element(self):
         self.marionette.set_search_timeout(0)
         self.marionette.navigate(id_html)
         el = self.marionette.find_element(By.ID, "foo")
         self.assertRaises(NoSuchElementException, el.find_element, By.CLASS_NAME, "cheese")
         self.assertRaises(NoSuchElementException, el.find_element, By.CSS_SELECTOR, "cheese")
         self.assertRaises(NoSuchElementException, el.find_element, By.ID, "cheese")
         self.assertRaises(NoSuchElementException, el.find_element, By.LINK_TEXT, "cheese")
         self.assertRaises(NoSuchElementException, el.find_element, By.NAME, "cheese")
         self.assertRaises(NoSuchElementException, el.find_element, By.PARTIAL_LINK_TEXT, "cheese")
         self.assertRaises(NoSuchElementException, el.find_element, By.TAG_NAME, "cheese")
         self.assertRaises(NoSuchElementException, el.find_element, By.XPATH, "cheese")
 
-    def test_not_found_implicit_wait(self):
+    def test_not_found_implicit_wait_from_element(self):
         self.marionette.set_search_timeout(50)
         self.marionette.navigate(id_html)
         el = self.marionette.find_element(By.ID, "foo")
         self.assertRaises(NoSuchElementException, el.find_element, By.CLASS_NAME, "cheese")
         self.assertRaises(NoSuchElementException, el.find_element, By.CSS_SELECTOR, "cheese")
         self.assertRaises(NoSuchElementException, el.find_element, By.ID, "cheese")
         self.assertRaises(NoSuchElementException, el.find_element, By.LINK_TEXT, "cheese")
         self.assertRaises(NoSuchElementException, el.find_element, By.NAME, "cheese")