mirror of
https://github.com/horizon-rust/horizon.git
synced 2026-11-07 11:06:11 -10:00
voidsipandCodex
b011ec1e66
Cached oracle runs replace java on PATH, so looking beside that executable points into the cache shim directory instead of the JDK. Resolve keytool directly and support JAVA_HOME when it is not on PATH. Fixes #9079 Co-Authored-By: Codex <[email protected]>
46 lines
2.2 KiB
Python
46 lines
2.2 KiB
Python
import os
|
|
from pathlib import Path
|
|
import tempfile
|
|
import unittest
|
|
from unittest import mock
|
|
|
|
from tools import test_management_protocol_parity as management
|
|
|
|
|
|
class KeystoreTests(unittest.TestCase):
|
|
def test_cached_java_uses_keytool_from_path(self):
|
|
with tempfile.TemporaryDirectory() as temp:
|
|
root = Path(temp)
|
|
shim = root / 'cache' / f'java{management.EXE}'
|
|
keytool = root / 'jdk' / 'bin' / f'keytool{management.EXE}'
|
|
context = mock.Mock(options=0)
|
|
def which(name):
|
|
return str(keytool if name == 'keytool' else shim)
|
|
with (mock.patch.dict(os.environ, {'JAVA_HOME': ''}),
|
|
mock.patch.object(management.shutil, 'which', side_effect=which),
|
|
mock.patch.object(management.subprocess, 'run') as run,
|
|
mock.patch.object(management.ssl, 'create_default_context', return_value=context)):
|
|
management.make_keystore(root)
|
|
self.assertEqual([Path(call.args[0][0]) for call in run.call_args_list], [keytool, keytool])
|
|
|
|
def test_keytool_from_java_home(self):
|
|
with tempfile.TemporaryDirectory() as temp:
|
|
root = Path(temp)
|
|
keytool = root / 'jdk' / 'bin' / f'keytool{management.EXE}'
|
|
keytool.parent.mkdir(parents=True)
|
|
keytool.touch()
|
|
context = mock.Mock(options=0)
|
|
with (mock.patch.dict(os.environ, {'JAVA_HOME': str(root / 'jdk')}),
|
|
mock.patch.object(management.shutil, 'which', return_value=None),
|
|
mock.patch.object(management.subprocess, 'run') as run,
|
|
mock.patch.object(management.ssl, 'create_default_context', return_value=context)):
|
|
management.make_keystore(root)
|
|
self.assertEqual([Path(call.args[0][0]) for call in run.call_args_list], [keytool, keytool])
|
|
|
|
def test_missing_keytool_reports_requirement(self):
|
|
with tempfile.TemporaryDirectory() as temp:
|
|
with (mock.patch.dict(os.environ, {'JAVA_HOME': ''}),
|
|
mock.patch.object(management.shutil, 'which', return_value=None),
|
|
self.assertRaisesRegex(RuntimeError, 'keytool')):
|
|
management.make_keystore(Path(temp))
|