Awight has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/345071 )
Change subject: Fix crontab CLI params
......................................................................
Fix crontab CLI params
Change-Id: I06307b498a051ec3998ca43e197953358fc9edac
---
M processcontrol/crontab.py
M tests/test_crontab.py
2 files changed, 7 insertions(+), 7 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/process-control
refs/changes/71/345071/1
diff --git a/processcontrol/crontab.py b/processcontrol/crontab.py
index b099e11..3e43987 100644
--- a/processcontrol/crontab.py
+++ b/processcontrol/crontab.py
@@ -36,11 +36,11 @@
def __str__(self):
if not self.enabled:
- return "# Skipping disabled job
{path}\n".format(path=self.job.config_path)
+ return "# Skipping disabled job
{name}\n".format(name=self.job.slug)
- command = "{runner} {conf}".format(
+ command = "{runner} {name}".format(
runner=self.job.global_config.get("runner_path"),
- conf=self.job.config_path)
+ name=self.job.slug)
template = self.job.global_config.get("cron_template")
diff --git a/tests/test_crontab.py b/tests/test_crontab.py
index 40cb3b5..6cc5b2d 100644
--- a/tests/test_crontab.py
+++ b/tests/test_crontab.py
@@ -36,12 +36,12 @@
tab = tab.replace(job_dir, "X")
tab = tab.replace(runner_path, "Y")
- expected = """# Skipping disabled job X/disabled.yaml
+ expected = """# Skipping disabled job disabled
# Generated from X/schedule_2.yaml
-*/10 * * * * jenkins Y X/schedule_2.yaml
+*/10 * * * * jenkins Y schedule_2
# Generated from X/schedule_good.yaml
-*/5 * * * * jenkins Y X/schedule_good.yaml
-# Skipping disabled job X/unscheduled.yaml
+*/5 * * * * jenkins Y schedule_good
+# Skipping disabled job unscheduled
"""
assert expected == tab
--
To view, visit https://gerrit.wikimedia.org/r/345071
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I06307b498a051ec3998ca43e197953358fc9edac
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/process-control
Gerrit-Branch: master
Gerrit-Owner: Awight <awi...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
