Merge pull request riptano#729 from aholmberg/merge-node-env

update (instead of replace) node environment variables when starting
bschoening · Mar 4, 2021 · 838c491 · 838c491
2 parents e5870fd + be9607e
commit 838c491
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/ccmlib/node.py b/ccmlib/node.py
@@ -835,10 +835,8 @@ def start(self,
                                          info_message=self.name)
         # Need to update the node's environment for nodetool and other tools.
         # (e.g. the host's JAVA_HOME points to Java 11, but the node's software is only for Java 8)
-        self.__environment_variables = {
-            'JAVA_HOME': env['JAVA_HOME'],
-            'PATH': env['PATH']
-        }
+        for k in 'JAVA_HOME', 'PATH':
+            self.__environment_variables[k] = env[k]
 
         common.info("Starting {} with JAVA_HOME={} java_version={} cassandra_version={}, install_dir={}"
                     .format(self.name, env['JAVA_HOME'], common.get_jdk_version_int(),

diff --git a/tests/ccmtest.py b/tests/ccmtest.py
@@ -1,6 +1,10 @@
 import os
 from unittest import TestCase
 
+try:
+    FileNotFoundError
+except NameError:
+    FileNotFoundError = IOError  # Python 2.7 compatibility
 
 class Tester(TestCase):