Nucypher
/
nucypher
mirror of https://github.com/nucypher/nucypher.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Adjust Ursula CLI tests for non-federated as a default

pull/1040/head
Kieran R. Prasch 2019-05-15 19:43:56 -06:00 committed by Kieran Prasch
parent c6edf8278e
commit 610f8cb59d
No known key found for this signature in database
GPG Key ID: 199AB839D4125A62
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
nucypher/cli/characters/ursula.py
View File

@ -377,16 +377,17 @@ def ursula(click_config,
elif action == "view": elif action == "view":
"""Paint an existing configuration to the console""" """Paint an existing configuration to the console"""
click.secho("BLOCKCHAIN ----------\n") if not URSULA.federated_only:
painting.paint_contract_status(click_config=click_config, ursula_config=ursula_config) click.secho("BLOCKCHAIN ----------\n")
current_block = URSULA.blockchain.interface.w3.eth.blockNumber painting.paint_contract_status(click_config=click_config, ursula_config=ursula_config)
click.secho(f'Block # {current_block}') current_block = URSULA.blockchain.interface.w3.eth.blockNumber
click.secho(f'NU Balance: {URSULA.token_balance}') click.secho(f'Block # {current_block}')
click.secho(f'ETH Balance: {URSULA.eth_balance}') click.secho(f'NU Balance: {URSULA.token_balance}')
click.secho(f'Current Gas Price {URSULA.blockchain.interface.w3.eth.gasPrice}') click.secho(f'ETH Balance: {URSULA.eth_balance}')
click.secho(f'Current Gas Price {URSULA.blockchain.interface.w3.eth.gasPrice}')
# TODO: Verbose status # TODO: Verbose status
# click.secho(f'{URSULA.blockchain.interface.w3.eth.getBlock(current_block)}') # click.secho(f'{URSULA.blockchain.interface.w3.eth.getBlock(current_block)}')
click.secho("CONFIGURATION --------") click.secho("CONFIGURATION --------")
response = UrsulaConfiguration._read_configuration_file(filepath=config_file or ursula_config.config_file_location) response = UrsulaConfiguration._read_configuration_file(filepath=config_file or ursula_config.config_file_location)

12
tests/cli/ursula/test_federated_ursula.py
View File

@ -43,12 +43,12 @@ def test_initialize_ursula_defaults(click_runner, mocker):
'--network', TEMPORARY_DOMAIN, '--network', TEMPORARY_DOMAIN,
'--federated-only') '--federated-only')
user_input = '{ip}\n{password}\n{password}\n'.format(password=INSECURE_DEVELOPMENT_PASSWORD, ip=MOCK_IP_ADDRESS) user_input = 'Y\n{password}\n{password}\n'.format(password=INSECURE_DEVELOPMENT_PASSWORD, ip=MOCK_IP_ADDRESS)
result = click_runner.invoke(nucypher_cli, init_args, input=user_input, catch_exceptions=False) result = click_runner.invoke(nucypher_cli, init_args, input=user_input, catch_exceptions=False)
assert result.exit_code == 0 assert result.exit_code == 0
# REST Host # REST Host
assert 'Enter Ursula\'s public-facing IPv4 address' in result.output assert 'Is this the public-facing IPv4 address' in result.output
# Auth # Auth
assert 'Enter keyring password:' in result.output, 'WARNING: User was not prompted for password' assert 'Enter keyring password:' in result.output, 'WARNING: User was not prompted for password'
@ -117,7 +117,7 @@ def test_password_prompt(click_runner, custom_filepath):
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'
view_args = ('ursula', 'view', '--config-file', custom_config_filepath) view_args = ('ursula', 'view', '--config-file', custom_config_filepath, '--federated-only')
user_input = '{}\n'.format(INSECURE_DEVELOPMENT_PASSWORD) user_input = '{}\n'.format(INSECURE_DEVELOPMENT_PASSWORD)
result = click_runner.invoke(nucypher_cli, view_args, input=user_input, catch_exceptions=False, env=dict()) result = click_runner.invoke(nucypher_cli, view_args, input=user_input, catch_exceptions=False, env=dict())
@ -206,12 +206,12 @@ def test_ursula_destroy_configuration(custom_filepath, click_runner):
# Run the destroy command # Run the destroy command
destruction_args = ('ursula', 'destroy', '--config-file', custom_config_filepath) destruction_args = ('ursula', 'destroy', '--config-file', custom_config_filepath)
result = click_runner.invoke(nucypher_cli, destruction_args, result = click_runner.invoke(nucypher_cli, destruction_args,
input='{}\nY\n'.format(INSECURE_DEVELOPMENT_PASSWORD), input='Y\n'.format(INSECURE_DEVELOPMENT_PASSWORD),
catch_exceptions=False) catch_exceptions=False,
env={'NUCYPHER_KEYRING_PASSWORD': INSECURE_DEVELOPMENT_PASSWORD})
# CLI Output # CLI Output
assert not os.path.isfile(custom_config_filepath), 'Configuration file still exists' assert not os.path.isfile(custom_config_filepath), 'Configuration file still exists'
assert 'password' in result.output, 'WARNING: User was not prompted for password'
assert '? [y/N]:' in result.output, 'WARNING: User was not asked to destroy files' assert '? [y/N]:' in result.output, 'WARNING: User was not asked to destroy files'
assert custom_filepath in result.output, 'WARNING: Configuration path not in output. Deleting the wrong path?' assert custom_filepath in result.output, 'WARNING: Configuration path not in output. Deleting the wrong path?'
assert f'Deleted' in result.output, '"Destroyed" not in output' assert f'Deleted' in result.output, '"Destroyed" not in output'