Cmcmahon has submitted this change and it was merged.

Change subject: Make ULS+commons Jenkins job green
......................................................................


Make ULS+commons Jenkins job green

Run only tests that pass. Workaround for hook that executes twice and
causes tests to fail.

Job URL:
https://wmf.ci.cloudbees.com/view/r-uls/job/UniversalLanguageSelector-co
mmons.wikimedia.beta.wmflabs.org-linux-firefox/

Change-Id: I43161b66b07880c54baa1c5748c96176b41c1daa
---
M tests/browser/features/ime.feature
M tests/browser/features/live_preview_of_display_language.feature
M tests/browser/features/persistent_settings.feature
M tests/browser/features/settings_panel.feature
M tests/browser/features/support/hooks.rb
M tests/browser/features/textarea_font.feature
M tests/browser/features/triggers.feature
7 files changed, 4 insertions(+), 8 deletions(-)

Approvals:
  Cmcmahon: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/tests/browser/features/ime.feature 
b/tests/browser/features/ime.feature
index 83e1000..9d6e2f2 100644
--- a/tests/browser/features/ime.feature
+++ b/tests/browser/features/ime.feature
@@ -1,4 +1,3 @@
[email protected]
 Feature: Input method engine
 
 User is able to select among different input methods via a menu which is
diff --git a/tests/browser/features/live_preview_of_display_language.feature 
b/tests/browser/features/live_preview_of_display_language.feature
index 748dd4c..e2fc529 100644
--- a/tests/browser/features/live_preview_of_display_language.feature
+++ b/tests/browser/features/live_preview_of_display_language.feature
@@ -1,4 +1,4 @@
-@login @reset-preferences-after @commons.wikimedia.beta.wmflabs.org
+@login @reset-preferences-after
 Feature: Live preview of display language changes
 
   Background:
diff --git a/tests/browser/features/persistent_settings.feature 
b/tests/browser/features/persistent_settings.feature
index f3bc676..ba1fa2d 100644
--- a/tests/browser/features/persistent_settings.feature
+++ b/tests/browser/features/persistent_settings.feature
@@ -1,4 +1,4 @@
-@login @reset-preferences-after @commons.wikimedia.beta.wmflabs.org
+@login @reset-preferences-after
 Feature: Persistent settings
 
   This assumes wiki content language is English.
diff --git a/tests/browser/features/settings_panel.feature 
b/tests/browser/features/settings_panel.feature
index f252464..d4a07fc 100644
--- a/tests/browser/features/settings_panel.feature
+++ b/tests/browser/features/settings_panel.feature
@@ -1,4 +1,3 @@
[email protected] 
 Feature: Settings panel
 
   @login @ime-default-on
diff --git a/tests/browser/features/support/hooks.rb 
b/tests/browser/features/support/hooks.rb
index d5358c1..9731900 100644
--- a/tests/browser/features/support/hooks.rb
+++ b/tests/browser/features/support/hooks.rb
@@ -16,6 +16,5 @@
 end
 
 After('@reset-preferences-after') do |scenario|
-  visit(ResetPreferencesPage)
-  on(ResetPreferencesPage).submit_element.click
+  visit(ResetPreferencesPage).submit_element.click if @browser.exist?
 end
diff --git a/tests/browser/features/textarea_font.feature 
b/tests/browser/features/textarea_font.feature
index 2b6a83b..28d8fb1 100644
--- a/tests/browser/features/textarea_font.feature
+++ b/tests/browser/features/textarea_font.feature
@@ -1,4 +1,4 @@
-@login @commons.wikimedia.beta.wmflabs.org
+@login
 Feature: Font preferences respected in different languages
 
   If a user has an edit font preferences respect that preference.
diff --git a/tests/browser/features/triggers.feature 
b/tests/browser/features/triggers.feature
index e44c84d..5f25900 100644
--- a/tests/browser/features/triggers.feature
+++ b/tests/browser/features/triggers.feature
@@ -1,4 +1,3 @@
[email protected] 
 Feature: Trigger in personal toolbar
 
   @login @uls-in-personal-only

-- 
To view, visit https://gerrit.wikimedia.org/r/91377
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I43161b66b07880c54baa1c5748c96176b41c1daa
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Zfilipin <[email protected]>
Gerrit-Reviewer: Amire80 <[email protected]>
Gerrit-Reviewer: Cmcmahon <[email protected]>
Gerrit-Reviewer: KartikMistry <[email protected]>
Gerrit-Reviewer: Nikerabbit <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: jenkins-bot

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to