Bug 1168533 - Add @skip_under_xvfb to test functions and not classes.…

… r=whimboo (cherry picked from commit 39942fb)
mozilla · May 27, 2015 · 42295df · 42295df
1 parent bcd897d
commit 42295df
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/firefox_ui_tests/functional/locationbar/manifest.ini b/firefox_ui_tests/functional/locationbar/manifest.ini
@@ -1,3 +1,4 @@
-[test_suggest_bookmarks.py]
-[test_escape_autocomplete.py]
 [test_access_locationbar.py]
+disabled = Bug 1168727 - Timeout when opening auto-complete popup
+[test_escape_autocomplete.py]
+[test_suggest_bookmarks.py]
diff --git a/firefox_ui_tests/functional/locationbar/test_access_locationbar.py b/firefox_ui_tests/functional/locationbar/test_access_locationbar.py
@@ -6,7 +6,6 @@
 from firefox_ui_harness import FirefoxTestCase
 
 
-@skip_under_xvfb
 class TestAccessLocationBar(FirefoxTestCase):
 
     def setUp(self):
@@ -27,6 +26,7 @@ def setUp(self):
         self.autocomplete_results = self.locationbar.autocomplete_results
         self.urlbar = self.locationbar.urlbar
 
+    @skip_under_xvfb
     def test_access_locationbar_history(self):
 
         # Open some local pages, then about:blank

diff --git a/firefox_ui_tests/functional/locationbar/test_escape_autocomplete.py b/firefox_ui_tests/functional/locationbar/test_escape_autocomplete.py
@@ -6,7 +6,6 @@
 from firefox_ui_harness import FirefoxTestCase
 
 
-@skip_under_xvfb
 class TestEscapeAutocomplete(FirefoxTestCase):
 
     def setUp(self):
@@ -31,6 +30,7 @@ def tearDown(self):
         self.autocomplete_results.close(force=True)
         FirefoxTestCase.tearDown(self)
 
+    @skip_under_xvfb
     def test_escape_autocomplete(self):
         # Open some local pages
         def load_urls():

diff --git a/firefox_ui_tests/functional/locationbar/test_suggest_bookmarks.py b/firefox_ui_tests/functional/locationbar/test_suggest_bookmarks.py
@@ -8,7 +8,6 @@
 from firefox_ui_harness import FirefoxTestCase
 
 
-@skip_under_xvfb
 class TestStarInAutocomplete(FirefoxTestCase):
     """ This replaces
     http://hg.mozilla.org/qa/mozmill-tests/file/default/firefox/tests/functional/testAwesomeBar/testSuggestBookmarks.js
@@ -38,6 +37,7 @@ def tearDown(self):
         finally:
             FirefoxTestCase.tearDown(self)
 
+    @skip_under_xvfb
     def test_star_in_autocomplete(self):
         search_string = 'grants'