jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/345768 )
Change subject: Merge environment, don't clobber
......................................................................
Merge environment, don't clobber
Change-Id: Ide20e2ad2724715833fa2a7b15be08e7d3b7272c
---
M processcontrol/job_wrapper.py
M tests/test_job_wrapper.py
2 files changed, 6 insertions(+), 3 deletions(-)
Approvals:
Cdentinger: Looks good to me, approved
jenkins-bot: Verified
Ejegg: Looks good to me, but someone else must approve
diff --git a/processcontrol/job_wrapper.py b/processcontrol/job_wrapper.py
index 3ec58bf..b09bda1 100644
--- a/processcontrol/job_wrapper.py
+++ b/processcontrol/job_wrapper.py
@@ -56,10 +56,9 @@
if not self.config.has("schedule"):
self.enabled = False
+ self.environment = os.environ.copy()
if self.config.has("environment"):
- self.environment = self.config.get("environment")
- else:
- self.environment = {}
+ self.environment.update(self.config.get("environment"))
def run(self):
# Check that we are the service user.
diff --git a/tests/test_job_wrapper.py b/tests/test_job_wrapper.py
index 73cf23d..ea6062e 100644
--- a/tests/test_job_wrapper.py
+++ b/tests/test_job_wrapper.py
@@ -1,6 +1,7 @@
import glob
import mock
import nose
+import os
import testfixtures
from processcontrol import job_wrapper
@@ -93,9 +94,12 @@
def test_environment():
+ os.environ["MYENV"] = "pre-existing"
+
run_job("env")
lines = get_output_lines("env")
assert "INFO\tfoo1=bar" in lines
assert "INFO\tfoo2=rebar" in lines
+ assert "INFO\tMYENV=pre-existing" in lines
--
To view, visit https://gerrit.wikimedia.org/r/345768
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ide20e2ad2724715833fa2a7b15be08e7d3b7272c
Gerrit-PatchSet: 5
Gerrit-Project: wikimedia/fundraising/process-control
Gerrit-Branch: master
Gerrit-Owner: Ejegg <[email protected]>
Gerrit-Reviewer: Awight <[email protected]>
Gerrit-Reviewer: Cdentinger <[email protected]>
Gerrit-Reviewer: Ejegg <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
