diff options
| author |  laszlocsomor <laszlocsomor@google.com> | 2018-07-05 02:36:06 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-07-05 02:37:43 -0700 |
| commit | 2282728b8ba434f60e492bb0715aefdd8b54fffe (patch) | |
| tree | 719f5a2c91df631ceb25e1a635627837b0a6f903 /src/test/py | |
| parent | f11c6bcab87ee8927e23a23d2300900a0922616d (diff) | |
Windows,python tests: fine if $JAVA_HOME is empty
It's no longer fatal for the test if $JAVA_HOME
environment variable is unset.
Before this fix the test was crashing if JAVA_HOME
was not set.
RELNOTES: none
PiperOrigin-RevId: 203350738
Diffstat (limited to 'src/test/py')
| -rw-r--r-- | src/test/py/bazel/test_base.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/test/py/bazel/test_base.py b/src/test/py/bazel/test_base.py index 4d5278876c..a5c6f70fbc 100644 --- a/src/test/py/bazel/test_base.py +++ b/src/test/py/bazel/test_base.py @@ -104,7 +104,7 @@ class TestBase(unittest.TestCase): """ value = os.getenv(name, '__undefined_envvar__') if value == '__undefined_envvar__': - if default: + if default is not None: return default raise EnvVarUndefinedError(name) return value @@ -357,9 +357,10 @@ class TestBase(unittest.TestCase): 'BAZEL_SH': TestBase.GetEnv('BAZEL_SH', 'c:\\tools\\msys64\\usr\\bin\\bash.exe'), - 'JAVA_HOME': - TestBase.GetEnv('JAVA_HOME'), } + java_home = TestBase.GetEnv('JAVA_HOME', '') + if java_home: + env['JAVA_HOME'] = java_home else: env = {'HOME': os.path.join(self._temp, 'home')} |