Zfilipin has uploaded a new change for review.
https://gerrit.wikimedia.org/r/59622
Change subject: Simplified the way the tests are executed
......................................................................
Simplified the way the tests are executed
Instead of relying on Rakefile, Cucumber tags and configuration file,
explicitly define which tests should be executed in Jenkins job
configuration.
Change-Id: I6e8c5ba0c0246469458298f915218ac7116e85a1
---
M Rakefile
M config/cucumber.yml
A docs/jobs.md
M features/accept_language.feature
4 files changed, 80 insertions(+), 53 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/qa/browsertests
refs/changes/22/59622/1
diff --git a/Rakefile b/Rakefile
index 80ca5f5..4f6f84f 100755
--- a/Rakefile
+++ b/Rakefile
@@ -15,47 +15,3 @@
task :parallel do
sh "bundle exec parallel_cucumber features/ -n #{processes} --test-options
'--profile ci'"
end
-
-def run_tests(browser)
- sh "bundle exec parallel_cucumber features/ -n #{processes} --test-options
'--profile #{browser}'"
-end
-
-desc 'Run all Cucumber features in parallel, do not run tests that fail in
Chrome.'
-task :chrome do |t|
- run_tests(t.name)
-end
-
-desc 'Run all Cucumber features in parallel, do not run tests that fail in
Firefox.'
-task :firefox do |t|
- run_tests(t.name)
-end
-
-desc 'Run all Cucumber features in parallel, do not run tests that have known
bugs in IE6.'
-task :ie6 do |t|
- run_tests(t.name)
-end
-
-desc 'Run all Cucumber features in parallel, do not run tests that have known
bugs in IE7.'
-task :ie7 do |t|
- run_tests(t.name)
-end
-
-desc 'Run all Cucumber features in parallel, do not run tests that have known
bugs in IE8.'
-task :ie8 do |t|
- run_tests(t.name)
-end
-
-desc 'Run all Cucumber features in parallel, do not run tests that have known
bugs in IE9.'
-task :ie9 do |t|
- run_tests(t.name)
-end
-
-desc 'Run all Cucumber features in parallel, do not run tests that have known
bugs in IE10.'
-task :ie10 do |t|
- run_tests(t.name)
-end
-
-desc 'Run all Cucumber features in parallel, do not run tests that have known
bugs in PhantomJS.'
-task :phantomjs do |t|
- run_tests(t.name)
-end
diff --git a/config/cucumber.yml b/config/cucumber.yml
index 230bf18..6bb87d8 100644
--- a/config/cucumber.yml
+++ b/config/cucumber.yml
@@ -1,10 +1,2 @@
-chrome: --format Cucumber::Formatter::Sauce --out reports/junit --format html
--out reports/cucumber<%= ENV['TEST_ENV_NUMBER'] %>.html --tags ~@bug --tags
~@firefox
ci: --format Cucumber::Formatter::Sauce --out reports/junit --format html
--out reports/cucumber<%= ENV['TEST_ENV_NUMBER'] %>.html
default: --format progress
-firefox: --format Cucumber::Formatter::Sauce --out reports/junit --format html
--out reports/cucumber<%= ENV['TEST_ENV_NUMBER'] %>.html --tags ~@bug --tags
~@firefox-bug
-ie6: --format Cucumber::Formatter::Sauce --out reports/junit --format html
--out reports/cucumber<%= ENV['TEST_ENV_NUMBER'] %>.html --tags ~@bug --tags
~@firefox --tags ~@ie6-bug
-ie7: --format Cucumber::Formatter::Sauce --out reports/junit --format html
--out reports/cucumber<%= ENV['TEST_ENV_NUMBER'] %>.html --tags ~@bug --tags
~@firefox --tags ~@ie7-bug
-ie8: --format Cucumber::Formatter::Sauce --out reports/junit --format html
--out reports/cucumber<%= ENV['TEST_ENV_NUMBER'] %>.html --tags ~@bug --tags
~@firefox --tags ~@ie8-bug
-ie9: --format Cucumber::Formatter::Sauce --out reports/junit --format html
--out reports/cucumber<%= ENV['TEST_ENV_NUMBER'] %>.html --tags ~@bug --tags
~@firefox --tags ~@ie9-bug
-ie10: --format Cucumber::Formatter::Sauce --out reports/junit --format html
--out reports/cucumber<%= ENV['TEST_ENV_NUMBER'] %>.html --tags ~@bug --tags
~@firefox --tags ~@ie10-bug
-phantomjs: --format Cucumber::Formatter::Sauce --out reports/junit --format
html --out reports/cucumber<%= ENV['TEST_ENV_NUMBER'] %>.html --tags ~@bug
--tags ~@firefox --tags ~@phantomjs-bug
diff --git a/docs/jobs.md b/docs/jobs.md
new file mode 100644
index 0000000..76c9422
--- /dev/null
+++ b/docs/jobs.md
@@ -0,0 +1,79 @@
+# browsertests-commons.wikimedia.beta.wmflabs.org-linux-chrome
+- Browser Label: chrome
+- bundle exec: parallel_cucumber features/upload_wizard.feature -n 1
--test-options '--profile ci'
+- Recipients: [email protected] [email protected]
+- Repository URL: browsertests@gerrit
+- Branch: master
+- MediaWiki URL: commons.wikimedia.beta.wmflabs.org
+
+# browsertests-en.wikipedia.beta.wmflabs.org-linux-chrome
+- Browser Label: chrome
+- bundle exec: parallel_cucumber features/aftv5.feature
features/create_account.feature features/file.feature
features/page_edit.feature features/page_triage.feature features/search.feature
-n 6 --test-options '--profile ci'
+- Recipients: [email protected] [email protected]
+- Repository URL: browsertests@gerrit
+- Branch: master
+- MediaWiki URL: en.wikipedia.beta.wmflabs.or
+
+# browsertests-en.wikipedia.org-linux-firefox
+- Browser Label: firefox
+- bundle exec: parallel_cucumber features/create_account.feature
features/math.feature features/page_triage.feature -n 3 --test-options
'--profile ci'
+- Recipients: [email protected] [email protected]
+- Repository URL: browsertests@gerrit
+- Branch: master
+- MediaWiki URL: en.wikipedia.org
+
+# browsertests-sandbox.translatewiki.net-linux-firefox
+- Browser Label: firefox
+- bundle exec: parallel_cucumber features/accept_language.feature
features/universal_language_selector.feature -n 2 --test-options '--profile ci'
+- Recipients: [email protected] [email protected]
+- Repository URL: browsertests@gerrit
+- Branch: master
+- MediaWiki URL: sandbox.translatewiki.net
+
+# browsertests-test2.wikipedia.org-linux-chrome
+- Browser Label: chrome
+- bundle exec: parallel_cucumber features/create_account.feature
features/file.feature features/guided_tour.feature features/login.feature
features/math.feature features/page.feature features/page_edit.feature
features/page_triage.feature features/search.feature
features/upload_wizard.feature -n 10 --test-options '--profile ci'
+- Recipients: [email protected] [email protected]
+- Repository URL: browsertests@gerrit
+- Branch: master
+- MediaWiki URL: test2.wikipedia.org
+
+# browsertests-test2.wikipedia.org-linux-firefox
+- Browser Label: firefox
+- bundle exec: parallel_cucumber features/create_account.feature
features/file.feature features/guided_tour.feature features/login.feature
features/math.feature features/page.feature features/page_edit.feature
features/page_triage.feature features/search.feature
features/upload_wizard.feature -n 10 --test-options '--profile ci'
+- Recipients: [email protected] [email protected]
+- Repository URL: browsertests@gerrit
+- Branch: master
+- MediaWiki URL: test2.wikipedia.org
+
+# browsertests-test2.wikipedia.org-windows-internet_explorer_6
+- Browser Label: internet_explorer_6
+- bundle exec: parallel_cucumber features/create_account.feature
features/file.feature features/guided_tour.feature features/login.feature
features/math.feature features/page.feature features/page_edit.feature
features/page_triage.feature features/search.feature
features/upload_wizard.feature -n 10 --test-options '--profile ci'
+- Recipients: [email protected] [email protected]
+- Repository URL: browsertests@gerrit
+- Branch: master
+- MediaWiki URL: test2.wikipedia.org
+
+# browsertests-test2.wikipedia.org-windows-internet_explorer_7
+- Browser Label: internet_explorer_7
+- bundle exec: parallel_cucumber features/create_account.feature
features/file.feature features/guided_tour.feature features/login.feature
features/math.feature features/page.feature features/page_edit.feature
features/page_triage.feature features/search.feature
features/upload_wizard.feature -n 10 --test-options '--profile ci'
+- Recipients: [email protected] [email protected]
+- Repository URL: browsertests@gerrit
+- Branch: master
+- MediaWiki URL: test2.wikipedia.org
+
+# browsertests-test2.wikipedia.org-windows-internet_explorer_8
+- Browser Label: internet_explorer_8
+- bundle exec: parallel_cucumber features/create_account.feature
features/file.feature features/guided_tour.feature features/login.feature
features/math.feature features/page.feature features/page_edit.feature
features/page_triage.feature features/search.feature
features/upload_wizard.feature -n 10 --test-options '--profile ci'
+- Recipients: [email protected] [email protected]
+- Repository URL: browsertests@gerrit
+- Branch: master
+- MediaWiki URL: test2.wikipedia.org
+
+# browsertests-test2.wikipedia.org-windows-internet_explorer_9
+- Browser Label: internet_explorer_9
+- bundle exec: parallel_cucumber features/create_account.feature
features/file.feature features/guided_tour.feature features/login.feature
features/math.feature features/page.feature features/page_edit.feature
features/page_triage.feature features/search.feature
features/upload_wizard.feature -n 10 --test-options '--profile ci'
+- Recipients: [email protected] [email protected]
+- Repository URL: browsertests@gerrit
+- Branch: master
+- MediaWiki URL: test2.wikipedia.org
diff --git a/features/accept_language.feature b/features/accept_language.feature
index f35dbe6..4df402b 100644
--- a/features/accept_language.feature
+++ b/features/accept_language.feature
@@ -1,4 +1,4 @@
-@firefox @language
+@language
Feature: Universal Language Selector Accept-Language
Scenario Outline: Accept-Language
--
To view, visit https://gerrit.wikimedia.org/r/59622
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6e8c5ba0c0246469458298f915218ac7116e85a1
Gerrit-PatchSet: 1
Gerrit-Project: qa/browsertests
Gerrit-Branch: master
Gerrit-Owner: Zfilipin <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
