Fix to replace current env with a blank one.
Actual builder unitttest environment isn't the same as just running
gmerge_test.py. This fix captures that
Change-Id: I9e87e32f0025bfb7ec7d31a37c11f6cb2d8dba21
BUG=TreeCloser
TEST=Ran cros_run_unit_test cros-devutils
Review URL: http://codereview.chromium.org/6850002
diff --git a/gmerge_test.py b/gmerge_test.py
index 912d8cc..c65d631 100755
--- a/gmerge_test.py
+++ b/gmerge_test.py
@@ -30,7 +30,8 @@
merger.lsb_release)
def testPostData(self):
- original_use = os.environ.get('USE', '')
+ old_env = os.environ
+ os.environ = {}
os.environ['USE'] = 'a b c d +e'
gmerge.FLAGS = Flags({'accept_stable': 'blah'})
@@ -38,7 +39,7 @@
self.assertEqual(
'use=a+b+c+d+%2Be&pkg=package_name&board=x86-mario&accept_stable=blah',
merger.GeneratePackageRequest('package_name'))
- os.environ['USE'] = original_use
+ os.environ = old_env
if __name__ == '__main__':
