Skip to content
This repository has been archived by the owner on Oct 31, 2023. It is now read-only.

Fixed rpc tests after disabling concent #4393

Merged
merged 4 commits into from
Jul 1, 2019
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
from ..playbook import Playbook as NodeTestPlaybook
from scripts.node_integration_tests.playbooks.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)
self.fail()

def on_error(error):
self.fail(error)

return self.call(NodeId.provider, 'pay.deposit_balance',
on_success=on_success, on_error=on_error)
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
from scripts.node_integration_tests.playbooks.test_config_base import \
TestConfigBase


class TestConfig(TestConfigBase):
def __init__(self):
super().__init__()
for node_config in self.nodes.values():
node_config.concent = 'staging'
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from ....base import NodeTestPlaybook
from ..playbook import Playbook as NodeTestPlaybook


class Playbook(NodeTestPlaybook):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from ....test_config_base import TestConfigBase
from scripts.node_integration_tests.playbooks.test_config_base import \
TestConfigBase


class TestConfig(TestConfigBase):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

This file was deleted.

This file was deleted.

6 changes: 3 additions & 3 deletions scripts/node_integration_tests/tests/test_golem.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand All @@ -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')
Expand Down