Merge pull request #4393 from golemfactory/mwu/int-fix-rpc

Fixed rpc tests after disabling concent

scripts/node_integration_tests/playbooks/golem/rpc_test/concent/playbook.py

@@ -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)

scripts/node_integration_tests/playbooks/golem/rpc_test/concent/test_config.py

@@ -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'

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):

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):

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)

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,12 @@ 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')
+        self._run_test('golem.rpc_test.mainnet', '--mainnet')
 
     def test_task_timeout(self):
         self._run_test('golem.task_timeout')