From 8c66996b29a407163333086333529d4f8b832388 Mon Sep 17 00:00:00 2001
From: maddog <jamilmerali2010@u.northwestern.edu>
Date: Tue, 18 Apr 2017 11:26:20 -0400
Subject: [PATCH] Change to env=None in Gerrit Reporter and GerritChangeSource

---
 master/buildbot/changes/gerritchangesource.py     |  4 +---
 master/buildbot/reporters/gerrit.py               |  7 ++-----
 master/buildbot/test/unit/test_reporter_gerrit.py | 11 +++++------
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/master/buildbot/changes/gerritchangesource.py b/master/buildbot/changes/gerritchangesource.py
index 2e965c32a72..27cbed3a082 100644
--- a/master/buildbot/changes/gerritchangesource.py
+++ b/master/buildbot/changes/gerritchangesource.py
@@ -19,7 +19,6 @@
 
 import datetime
 import json
-import os
 
 from twisted.internet import defer
 from twisted.internet import reactor
@@ -314,8 +313,7 @@ def startStreamProcess(self):
             args = args + ['-i', self.identity_file]
         self.process = reactor.spawnProcess(
             self.LocalPP(self), "ssh",
-            ["ssh"] + args + ["gerrit", "stream-events"],
-            env={'PATH': os.environ.get('PATH', '')})
+            ["ssh"] + args + ["gerrit", "stream-events"], env=None)
 
     def activate(self):
         self.wantProcess = True
diff --git a/master/buildbot/reporters/gerrit.py b/master/buildbot/reporters/gerrit.py
index d0b0f9592bc..f864c045509 100644
--- a/master/buildbot/reporters/gerrit.py
+++ b/master/buildbot/reporters/gerrit.py
@@ -21,7 +21,6 @@
 from future.builtins import range
 from future.utils import iteritems
 
-import os
 import time
 import warnings
 from distutils.version import LooseVersion
@@ -240,8 +239,7 @@ def callWithVersion(self, func):
         callback = lambda gerrit_version: self.processVersion(
             gerrit_version, func)
 
-        self.spawnProcess(self.VersionPP(callback), command[0], command,
-                          env={'PATH': os.environ.get('PATH', '')})
+        self.spawnProcess(self.VersionPP(callback), command[0], command, env=None)
 
     class LocalPP(ProcessProtocol):
 
@@ -426,8 +424,7 @@ def sendCodeReview(self, project, revision, result):
 
         command.append(revision)
         command = [str(s) for s in command]
-        self.spawnProcess(self.LocalPP(self), command[0], command,
-                          env={'PATH': os.environ.get('PATH', '')})
+        self.spawnProcess(self.LocalPP(self), command[0], command, env=None)
 
     def spawnProcess(self, *arg, **kw):
         reactor.spawnProcess(*arg, **kw)
diff --git a/master/buildbot/test/unit/test_reporter_gerrit.py b/master/buildbot/test/unit/test_reporter_gerrit.py
index 514fd6f1f1c..979bc73f495 100644
--- a/master/buildbot/test/unit/test_reporter_gerrit.py
+++ b/master/buildbot/test/unit/test_reporter_gerrit.py
@@ -19,7 +19,6 @@
 
 import warnings
 
-from mock import ANY
 from mock import Mock
 from mock import call
 
@@ -451,14 +450,14 @@ def testBuildGerritCommand(self):
         gsp.spawnProcess = lambda _, *a, **k: spawnSkipFirstArg(*a, **k)
         yield gsp.sendCodeReview("project", "revision", {"message": "bla", "labels": {'Verified': 1}})
         spawnSkipFirstArg.assert_called_once_with(
-            'ssh', ['ssh', 'user@serv', '-p', '29418', 'gerrit', 'version'], env={'PATH': ANY})
+            'ssh', ['ssh', 'user@serv', '-p', '29418', 'gerrit', 'version'], env=None)
         gsp.processVersion("2.6", lambda: None)
         spawnSkipFirstArg = Mock()
         yield gsp.sendCodeReview("project", "revision", {"message": "bla", "labels": {'Verified': 1}})
         spawnSkipFirstArg.assert_called_once_with(
             'ssh',
             ['ssh', 'user@serv', '-p', '29418', 'gerrit', 'review',
-             '--project project', "--message 'bla'", '--label Verified=1', 'revision'], env={'PATH': ANY})
+             '--project project', "--message 'bla'", '--label Verified=1', 'revision'], env=None)
 
         # <=2.5 uses other syntax
         gsp.processVersion("2.4", lambda: None)
@@ -467,7 +466,7 @@ def testBuildGerritCommand(self):
         spawnSkipFirstArg.assert_called_once_with(
             'ssh',
             ['ssh', 'user@serv', '-p', '29418', 'gerrit', 'review', '--project project',
-             "--message 'bla'", '--verified 1', 'revision'], env={'PATH': ANY})
+             "--message 'bla'", '--verified 1', 'revision'], env=None)
 
         # now test the notify argument, even though _gerrit_notify
         # is private, work around that
@@ -479,7 +478,7 @@ def testBuildGerritCommand(self):
             'ssh',
             ['ssh', 'user@serv', '-p', '29418', 'gerrit', 'review',
              '--project project', '--notify OWNER', "--message 'bla'", '--label Verified=1', 'revision'],
-            env={'PATH': ANY})
+            env=None)
 
         # gerrit versions <= 2.5 uses other syntax
         gsp.processVersion('2.4', lambda: None)
@@ -489,4 +488,4 @@ def testBuildGerritCommand(self):
             'ssh',
             ['ssh', 'user@serv', '-p', '29418', 'gerrit', 'review', '--project project', '--notify OWNER',
              "--message 'bla'", '--verified 1', 'revision'],
-            env={'PATH': ANY})
+            env=None)