From fdc7a53e5a3f7833d7a34b7b9cc8b5ca8c2e541a Mon Sep 17 00:00:00 2001 From: maaktweluit <10008353+maaktweluit@users.noreply.github.com> Date: Thu, 27 Jun 2019 11:09:05 +0200 Subject: [PATCH 1/4] Fixed rpc tests after disabling concent --- .../golem/rpc_test/concent/playbook.py | 18 +++++++++++ .../golem/rpc_test/concent/test_config.py | 8 +++++ .../golem/rpc_test/mainnet/playbook.py | 2 +- .../playbooks/golem/rpc_test/playbook.py | 8 ++--- .../golem/rpc_test/testnet/__init__.py | 0 .../golem/rpc_test/testnet/playbook.py | 30 ------------------- .../golem/rpc_test/testnet/test_config.py | 5 ---- .../tests/test_golem.py | 6 ++-- 8 files changed, 32 insertions(+), 45 deletions(-) create mode 100644 scripts/node_integration_tests/playbooks/golem/rpc_test/concent/playbook.py create mode 100644 scripts/node_integration_tests/playbooks/golem/rpc_test/concent/test_config.py delete mode 100644 scripts/node_integration_tests/playbooks/golem/rpc_test/testnet/__init__.py delete mode 100644 scripts/node_integration_tests/playbooks/golem/rpc_test/testnet/playbook.py delete mode 100644 scripts/node_integration_tests/playbooks/golem/rpc_test/testnet/test_config.py diff --git a/scripts/node_integration_tests/playbooks/golem/rpc_test/concent/playbook.py b/scripts/node_integration_tests/playbooks/golem/rpc_test/concent/playbook.py new file mode 100644 index 0000000000..150a9b49c5 --- /dev/null +++ b/scripts/node_integration_tests/playbooks/golem/rpc_test/concent/playbook.py @@ -0,0 +1,18 @@ +from ..playbook import Playbook as NodeTestPlaybook +from ....test_config_base import NodeId + + +class Playbook(NodeTestPlaybook): + def step_verify_deposit_balance_call(self): + def on_success(result): + if result['value'] and result['status'] and result['timelock']: + print("Result correct %s" % result) + self.next() + else: + print("Unexpected result: %s" % result) + + def on_error(error): + self.fail(error) + + return self.call(NodeId.provider, 'pay.deposit_balance', + on_success=on_success, on_error=on_error) diff --git a/scripts/node_integration_tests/playbooks/golem/rpc_test/concent/test_config.py b/scripts/node_integration_tests/playbooks/golem/rpc_test/concent/test_config.py new file mode 100644 index 0000000000..8708d226da --- /dev/null +++ b/scripts/node_integration_tests/playbooks/golem/rpc_test/concent/test_config.py @@ -0,0 +1,8 @@ +from ....test_config_base import TestConfigBase + + +class TestConfig(TestConfigBase): + def __init__(self): + super().__init__() + for node_config in self.nodes.values(): + node_config.concent = 'staging' diff --git a/scripts/node_integration_tests/playbooks/golem/rpc_test/mainnet/playbook.py b/scripts/node_integration_tests/playbooks/golem/rpc_test/mainnet/playbook.py index a230ea6b81..1a2b2b73e1 100644 --- a/scripts/node_integration_tests/playbooks/golem/rpc_test/mainnet/playbook.py +++ b/scripts/node_integration_tests/playbooks/golem/rpc_test/mainnet/playbook.py @@ -1,4 +1,4 @@ -from ....base import NodeTestPlaybook +from ..playbook import Playbook as NodeTestPlaybook class Playbook(NodeTestPlaybook): diff --git a/scripts/node_integration_tests/playbooks/golem/rpc_test/playbook.py b/scripts/node_integration_tests/playbooks/golem/rpc_test/playbook.py index fde2f53d25..433653a380 100644 --- a/scripts/node_integration_tests/playbooks/golem/rpc_test/playbook.py +++ b/scripts/node_integration_tests/playbooks/golem/rpc_test/playbook.py @@ -6,12 +6,8 @@ class Playbook(NodeTestPlaybook): def step_verify_deposit_balance_call(self): - def on_success(result): - if result['value'] and result['status'] and result['timelock']: - print("Result correct %s" % result) - self.next() - else: - print("Unexpected result: %s" % result) + def on_success(_): + self.next() def on_error(error): self.fail(error) diff --git a/scripts/node_integration_tests/playbooks/golem/rpc_test/testnet/__init__.py b/scripts/node_integration_tests/playbooks/golem/rpc_test/testnet/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/scripts/node_integration_tests/playbooks/golem/rpc_test/testnet/playbook.py b/scripts/node_integration_tests/playbooks/golem/rpc_test/testnet/playbook.py deleted file mode 100644 index df12a3fedb..0000000000 --- a/scripts/node_integration_tests/playbooks/golem/rpc_test/testnet/playbook.py +++ /dev/null @@ -1,30 +0,0 @@ -from functools import partial - -from ....base import NodeTestPlaybook -from ....test_config_base import NodeId - - -class Playbook(NodeTestPlaybook): - def step_verify_deposit_balance_call(self): - def on_success(_): - self.next() - - def on_error(error): - self.fail(error) - - return self.call(NodeId.provider, 'pay.deposit_balance', - on_success=on_success, on_error=on_error) - - steps = ( - partial(NodeTestPlaybook.step_get_key, node_id=NodeId.provider), - partial(NodeTestPlaybook.step_get_key, node_id=NodeId.requestor), - partial(NodeTestPlaybook.step_get_network_info, - node_id=NodeId.provider), - partial(NodeTestPlaybook.step_get_network_info, - node_id=NodeId.requestor), - partial(NodeTestPlaybook.step_connect, node_id=NodeId.requestor, - target_node=NodeId.provider), - partial(NodeTestPlaybook.step_verify_connection, - node_id=NodeId.requestor, target_node=NodeId.provider), - step_verify_deposit_balance_call, - ) diff --git a/scripts/node_integration_tests/playbooks/golem/rpc_test/testnet/test_config.py b/scripts/node_integration_tests/playbooks/golem/rpc_test/testnet/test_config.py deleted file mode 100644 index 625f51d6de..0000000000 --- a/scripts/node_integration_tests/playbooks/golem/rpc_test/testnet/test_config.py +++ /dev/null @@ -1,5 +0,0 @@ -from ....test_config_base import TestConfigBase - - -class TestConfig(TestConfigBase): - pass diff --git a/scripts/node_integration_tests/tests/test_golem.py b/scripts/node_integration_tests/tests/test_golem.py index 8fe134a29d..654d4541b6 100644 --- a/scripts/node_integration_tests/tests/test_golem.py +++ b/scripts/node_integration_tests/tests/test_golem.py @@ -2,7 +2,7 @@ from golem.core.variables import PROTOCOL_CONST -from .base import NodeTestBase +from .base import NodeTestBase, disable_key_reuse class GolemNodeTest(NodeTestBase): @@ -16,9 +16,9 @@ def test_concent(self): def test_rpc(self): self._run_test('golem.rpc_test') + @disable_key_reuse def test_rpc_mainnet(self): - self._run_test( - 'golem.rpc_test.mainnet', '--mainnet') + self._run_test('golem.rpc_test.mainnet', '--mainnet') def test_task_timeout(self): self._run_test('golem.task_timeout') From efef27cbc60c3f071d79c583b8c12fb13d9e492a Mon Sep 17 00:00:00 2001 From: maaktweluit <10008353+maaktweluit@users.noreply.github.com> Date: Thu, 27 Jun 2019 11:42:00 +0200 Subject: [PATCH 2/4] linter --- .../playbooks/golem/rpc_test/concent/__init__.py | 0 .../playbooks/golem/rpc_test/concent/playbook.py | 2 +- .../playbooks/golem/rpc_test/concent/test_config.py | 3 ++- .../playbooks/golem/rpc_test/mainnet/test_config.py | 3 ++- 4 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 scripts/node_integration_tests/playbooks/golem/rpc_test/concent/__init__.py diff --git a/scripts/node_integration_tests/playbooks/golem/rpc_test/concent/__init__.py b/scripts/node_integration_tests/playbooks/golem/rpc_test/concent/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/scripts/node_integration_tests/playbooks/golem/rpc_test/concent/playbook.py b/scripts/node_integration_tests/playbooks/golem/rpc_test/concent/playbook.py index 150a9b49c5..924dd90016 100644 --- a/scripts/node_integration_tests/playbooks/golem/rpc_test/concent/playbook.py +++ b/scripts/node_integration_tests/playbooks/golem/rpc_test/concent/playbook.py @@ -1,5 +1,5 @@ from ..playbook import Playbook as NodeTestPlaybook -from ....test_config_base import NodeId +from scripts.node_integration_tests.playbooks.test_config_base import NodeId class Playbook(NodeTestPlaybook): diff --git a/scripts/node_integration_tests/playbooks/golem/rpc_test/concent/test_config.py b/scripts/node_integration_tests/playbooks/golem/rpc_test/concent/test_config.py index 8708d226da..c5bb74d207 100644 --- a/scripts/node_integration_tests/playbooks/golem/rpc_test/concent/test_config.py +++ b/scripts/node_integration_tests/playbooks/golem/rpc_test/concent/test_config.py @@ -1,4 +1,5 @@ -from ....test_config_base import TestConfigBase +from scripts.node_integration_tests.playbooks.test_config_base import \ + TestConfigBase class TestConfig(TestConfigBase): diff --git a/scripts/node_integration_tests/playbooks/golem/rpc_test/mainnet/test_config.py b/scripts/node_integration_tests/playbooks/golem/rpc_test/mainnet/test_config.py index e7de7de42f..08375ac2ec 100644 --- a/scripts/node_integration_tests/playbooks/golem/rpc_test/mainnet/test_config.py +++ b/scripts/node_integration_tests/playbooks/golem/rpc_test/mainnet/test_config.py @@ -1,4 +1,5 @@ -from ....test_config_base import TestConfigBase +from scripts.node_integration_tests.playbooks.test_config_base import \ + TestConfigBase class TestConfig(TestConfigBase): From c3ccbc64031e912c4d21fd57b604297207fc6525 Mon Sep 17 00:00:00 2001 From: maaktweluit <10008353+maaktweluit@users.noreply.github.com> Date: Thu, 27 Jun 2019 14:22:49 +0200 Subject: [PATCH 3/4] Review comment: added missing fail() on invalid response --- .../playbooks/golem/rpc_test/concent/playbook.py | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/node_integration_tests/playbooks/golem/rpc_test/concent/playbook.py b/scripts/node_integration_tests/playbooks/golem/rpc_test/concent/playbook.py index 924dd90016..2fdcd55236 100644 --- a/scripts/node_integration_tests/playbooks/golem/rpc_test/concent/playbook.py +++ b/scripts/node_integration_tests/playbooks/golem/rpc_test/concent/playbook.py @@ -10,6 +10,7 @@ def on_success(result): self.next() else: print("Unexpected result: %s" % result) + self.fail() def on_error(error): self.fail(error) From ceb736c2af2086362c9a4f1e8903168b0e3927d4 Mon Sep 17 00:00:00 2001 From: maaktweluit <10008353+maaktweluit@users.noreply.github.com> Date: Thu, 27 Jun 2019 14:50:29 +0200 Subject: [PATCH 4/4] Added concent test, since its no longer default --- scripts/node_integration_tests/tests/test_golem.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/node_integration_tests/tests/test_golem.py b/scripts/node_integration_tests/tests/test_golem.py index 654d4541b6..85e730f465 100644 --- a/scripts/node_integration_tests/tests/test_golem.py +++ b/scripts/node_integration_tests/tests/test_golem.py @@ -16,6 +16,9 @@ def test_concent(self): def test_rpc(self): self._run_test('golem.rpc_test') + def test_rpc_concent(self): + self._run_test('golem.rpc_test.concent') + @disable_key_reuse def test_rpc_mainnet(self): self._run_test('golem.rpc_test.mainnet', '--mainnet')