mirror of https://github.com/nucypher/nucypher.git
Ensure that operating mode is determined via configuration.
parent
33e1eef7bd
commit
d6ad99a8e0
|
@ -286,7 +286,7 @@ def ursula(click_config,
|
||||||
except CryptoError:
|
except CryptoError:
|
||||||
raise ursula_config.keyring.AuthenticationFailed
|
raise ursula_config.keyring.AuthenticationFailed
|
||||||
|
|
||||||
if not federated_only:
|
if not ursula_config.federated_only:
|
||||||
ursula_config.connect_to_blockchain(recompile_contracts=False)
|
ursula_config.connect_to_blockchain(recompile_contracts=False)
|
||||||
ursula_config.connect_to_contracts()
|
ursula_config.connect_to_contracts()
|
||||||
|
|
||||||
|
|
|
@ -83,7 +83,7 @@ def test_initialize_custom_configuration_root(custom_filepath, click_runner):
|
||||||
assert 'Repeat for confirmation:' in result.output, 'User was not prompted to confirm password'
|
assert 'Repeat for confirmation:' in result.output, 'User was not prompted to confirm password'
|
||||||
|
|
||||||
|
|
||||||
def test_configuration_file_contents(custom_filepath, nominal_configuration_fields):
|
def test_configuration_file_contents(custom_filepath, nominal_federated_configuration_fields):
|
||||||
custom_config_filepath = os.path.join(custom_filepath, UrsulaConfiguration.CONFIG_FILENAME)
|
custom_config_filepath = os.path.join(custom_filepath, UrsulaConfiguration.CONFIG_FILENAME)
|
||||||
assert os.path.isfile(custom_config_filepath), 'Configuration file does not exist'
|
assert os.path.isfile(custom_config_filepath), 'Configuration file does not exist'
|
||||||
|
|
||||||
|
@ -96,7 +96,7 @@ def test_configuration_file_contents(custom_filepath, nominal_configuration_fiel
|
||||||
except JSONDecodeError:
|
except JSONDecodeError:
|
||||||
raise pytest.fail(msg="Invalid JSON configuration file {}".format(custom_config_filepath))
|
raise pytest.fail(msg="Invalid JSON configuration file {}".format(custom_config_filepath))
|
||||||
|
|
||||||
for field in nominal_configuration_fields:
|
for field in nominal_federated_configuration_fields:
|
||||||
assert field in data, "Missing field '{}' from configuration file."
|
assert field in data, "Missing field '{}' from configuration file."
|
||||||
if any(keyword in field for keyword in ('path', 'dir')):
|
if any(keyword in field for keyword in ('path', 'dir')):
|
||||||
path = data[field]
|
path = data[field]
|
||||||
|
@ -126,7 +126,7 @@ def test_password_prompt(click_runner, custom_filepath):
|
||||||
assert result.exit_code == 0
|
assert result.exit_code == 0
|
||||||
|
|
||||||
|
|
||||||
def test_ursula_view_configuration(custom_filepath, click_runner, nominal_configuration_fields):
|
def test_ursula_view_configuration(custom_filepath, click_runner, nominal_federated_configuration_fields):
|
||||||
|
|
||||||
# Ensure the configuration file still exists
|
# Ensure the configuration file still exists
|
||||||
custom_config_filepath = os.path.join(custom_filepath, UrsulaConfiguration.CONFIG_FILENAME)
|
custom_config_filepath = os.path.join(custom_filepath, UrsulaConfiguration.CONFIG_FILENAME)
|
||||||
|
@ -142,7 +142,7 @@ def test_ursula_view_configuration(custom_filepath, click_runner, nominal_config
|
||||||
# CLI Output
|
# CLI Output
|
||||||
assert 'password' in result.output, 'WARNING: User was not prompted for password'
|
assert 'password' in result.output, 'WARNING: User was not prompted for password'
|
||||||
assert MOCK_CUSTOM_INSTALLATION_PATH in result.output
|
assert MOCK_CUSTOM_INSTALLATION_PATH in result.output
|
||||||
for field in nominal_configuration_fields:
|
for field in nominal_federated_configuration_fields:
|
||||||
assert field in result.output, "Missing field '{}' from configuration file."
|
assert field in result.output, "Missing field '{}' from configuration file."
|
||||||
|
|
||||||
# Make sure nothing crazy is happening...
|
# Make sure nothing crazy is happening...
|
||||||
|
|
|
@ -33,8 +33,8 @@ def click_runner():
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture(scope='module')
|
@pytest.fixture(scope='module')
|
||||||
def nominal_configuration_fields():
|
def nominal_federated_configuration_fields():
|
||||||
config = UrsulaConfiguration(dev_mode=True)
|
config = UrsulaConfiguration(dev_mode=True, federated_only=True)
|
||||||
config_fields = config.static_payload
|
config_fields = config.static_payload
|
||||||
del config_fields['is_me']
|
del config_fields['is_me']
|
||||||
yield tuple(config_fields.keys())
|
yield tuple(config_fields.keys())
|
||||||
|
|
Loading…
Reference in New Issue