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

Controller usage touch-ups.

pull/802/head
Kieran R. Prasch 2019-02-26 08:07:29 -07:00 committed by Kieran Prasch
parent cb135577bd
commit c8e460a101
No known key found for this signature in database
GPG Key ID: 199AB839D4125A62
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nucypher/characters/control/controllers.py
View File

@ -146,8 +146,7 @@ class WebController(CharacterController):
app_name: str,
character_contoller: CharacterController,
start_learning: bool = True,
crash_on_error: bool = _crash_on_error_default
):
crash_on_error: bool = _crash_on_error_default):
self.app_name = app_name

8
tests/characters/test_character_control.py
View File

@ -94,7 +94,7 @@ def test_bob_character_control_join_policy(bob_control_test_client, enacted_fede
enacted_federated_policy.bob.remember_node(enacted_federated_policy.ursulas[0])
response = bob_control_test_client.post('/join_policy', data=json.dumps(request_data))
assert b'{"result": {"policy_encrypting_key": "OK"}' in response.data
assert b'{"result": {"policy_encrypting_key": "OK"}' in response.data # TODO
assert response.status_code == 200
# Send bad data to assert error returns
@ -114,17 +114,17 @@ def test_bob_character_control_retrieve(bob_control_test_client, enacted_federat
'label': enacted_federated_policy.label.decode(),
'policy_encrypting_key': bytes(enacted_federated_policy.public_key).hex(),
'alice_verifying_key': bytes(enacted_federated_policy.alice.stamp).hex(),
'message_kit': message_kit.to_bytes().hex(),
'message_kit': b64encode(message_kit.to_bytes()).decode(),
}
response = bob_control_test_client.post('/retrieve', data=json.dumps(request_data))
assert response.status_code == 200
response_data = json.loads(response.data)
assert 'plaintexts' in response_data['result']
assert 'cleartexts' in response_data['result']
for plaintext in response_data['result']['cleartexts']:
assert b64decode(plaintext) == b'Welcome to the flippering.'
assert bytes(plaintext, encoding='utf-8') == b'Welcome to the flippering.'
# Send bad data to assert error returns
response = bob_control_test_client.post('/retrieve', data=json.dumps({'bad': 'input'}))

8
tests/fixtures.py
View File

@ -327,13 +327,13 @@ def blockchain_ursulas(three_agents, ursula_decentralized_test_config):
@pytest.fixture(scope='module')
def alice_control_test_client(federated_alice):
web_controller = federated_alice.make_web_controller()
web_controller = federated_alice.make_web_controller(crash_on_error=True)
yield web_controller._web_app.test_client()
@pytest.fixture(scope='module')
def bob_control_test_client(federated_bob):
web_controller = federated_bob.make_web_controller()
web_controller = federated_bob.make_web_controller(crash_on_error=True)
yield web_controller._web_app.test_client()
@ -341,14 +341,14 @@ def bob_control_test_client(federated_bob):
def enrico_control_test_client(capsule_side_channel):
_, data_source = capsule_side_channel
message_kit, enrico = capsule_side_channel
web_controller = enrico.make_web_controller()
web_controller = enrico.make_web_controller(crash_on_error=True)
yield web_controller._web_app.test_client()
@pytest.fixture(scope='module')
def enrico_control_from_alice(federated_alice, random_policy_label):
enrico = Enrico.from_alice(federated_alice, random_policy_label)
web_controller = enrico.make_web_controller()
web_controller = enrico.make_web_controller(crash_on_error=True)
yield web_controller._web_app.test_client()