From: =?utf-8?b?SsOpcsO0bWUgQ2hhcmFvdWk=?= Date: Fri, 2 Dec 2022 17:54:44 -0500 Subject: Fix jruby interpreter tests When JRuby is executed from a jar (embedded), it adds the RUBY environment variable. Since JRuby is instead loaded from the filesystem, this envvar isn't present, so don't expect it. See org/jruby/RubyInstanceConfig.java Forwarded: not-needed --- .../puppetlabs/services/jruby_pool_manager/jruby_interpreter_test.clj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/unit/puppetlabs/services/jruby_pool_manager/jruby_interpreter_test.clj b/test/unit/puppetlabs/services/jruby_pool_manager/jruby_interpreter_test.clj index 6c6602e..7bfd03a 100644 --- a/test/unit/puppetlabs/services/jruby_pool_manager/jruby_interpreter_test.clj +++ b/test/unit/puppetlabs/services/jruby_pool_manager/jruby_interpreter_test.clj @@ -15,7 +15,7 @@ ;; but are not expected to be set in most environments. However, in ;; order to make this more test robust, these variables are always ;; filtered out. - (is (= #{"HOME" "PATH" "GEM_HOME" "JARS_NO_REQUIRE" "JARS_REQUIRE" "RUBY"} + (is (= #{"HOME" "PATH" "GEM_HOME" "JARS_NO_REQUIRE" "JARS_REQUIRE"} (set (remove (set jruby-core/proxy-vars-allowed-list) (keys jruby-env))))))))) (deftest jruby-configured-env-vars @@ -28,6 +28,6 @@ ;; but are not expected to be set in most environments. However, in ;; order to make this test more robust, these variables are always ;; filtered out. - (is (= #{"HOME" "PATH" "GEM_HOME" "JARS_NO_REQUIRE" "JARS_REQUIRE" "FOO" "RUBY"} + (is (= #{"HOME" "PATH" "GEM_HOME" "JARS_NO_REQUIRE" "JARS_REQUIRE" "FOO"} (set (remove (set jruby-core/proxy-vars-allowed-list) (keys jruby-env))))) (is (= (.get jruby-env "FOO") "for_jruby"))))))