Filippo Giunchedi has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/402325 )
Change subject: Run mtail tests via rake->tox->nose
......................................................................
Run mtail tests via rake->tox->nose
Bug: T181794
Change-Id: I4777d27f942963212f2c7e4c5d7f6fe7b661a991
---
M rake_modules/taskgen.rb
M tox.ini
2 files changed, 10 insertions(+), 0 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, but someone else must approve
Ema: Looks good to me, but someone else must approve
jenkins-bot: Verified
Filippo Giunchedi: Looks good to me, approved
diff --git a/rake_modules/taskgen.rb b/rake_modules/taskgen.rb
index da4b103..c2e2aaa 100644
--- a/rake_modules/taskgen.rb
+++ b/rake_modules/taskgen.rb
@@ -289,6 +289,15 @@
end
tasks << 'tox:webperf'
end
+ mtail_files = filter_files_by("modules/mtail/files/**")
+ unless mtail_files.empty?
+ desc 'Run tox for mtail'
+ task :mtail do
+ res = system("tox -e mtail")
+ raise 'Tests for mtail failed!' if !res
+ end
+ tasks << 'tox:mtail'
+ end
tox_files = filter_files_by("*.py")
unless tox_files.empty?
desc 'Run flake8 on python files via tox'
diff --git a/tox.ini b/tox.ini
index 62496d1..6c4a4c7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,6 +2,7 @@
minversion = 1.6
skipsdist = True
+# See also rake_modules/taskgen.rb for additional cases where tox gets called
conditionally
envlist = webperf, commit-message, admin, apache, pep8, mtail
[flake8]
--
To view, visit https://gerrit.wikimedia.org/r/402325
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4777d27f942963212f2c7e4c5d7f6fe7b661a991
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: Ema <e...@wikimedia.org>
Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
