From eb413cc3f010d0767e86d0936e46a372ebec2afe Mon Sep 17 00:00:00 2001
From: Holger Nahrstaedt <holger@nahrstaedt.de>
Date: Wed, 11 Apr 2018 14:17:27 +0200
Subject: [PATCH] Try to fix unit tests for test_block
---
README.rst | 3 ---
beemgrapheneapi/graphenerpc.py | 2 +-
tests/beem/test_block.py | 28 ++++++++++------------------
3 files changed, 11 insertions(+), 22 deletions(-)
diff --git a/README.rst b/README.rst
index 0fe3c43c..24da62d4 100644
--- a/README.rst
+++ b/README.rst
@@ -38,9 +38,6 @@ Current build status
.. image:: https://api.codacy.com/project/badge/Grade/e5476faf97df4c658697b8e7a7efebd7
:target: https://www.codacy.com/app/holgern/beem?utm_source=github.com&utm_medium=referral&utm_content=holgern/beem&utm_campaign=Badge_Grade
-.. image:: https://api.codacy.com/project/badge/Coverage/e5476faf97df4c658697b8e7a7efebd7
- :target: https://www.codacy.com/app/holgern/beem?utm_source=github.com&utm_medium=referral&utm_content=holgern/beem&utm_campaign=Badge_Coverage
-
.. image:: https://api.codeclimate.com/v1/badges/e7bdb5b4aa7ab160a780/test_coverage
:target: https://codeclimate.com/github/holgern/beem/test_coverage
:alt: Test Coverage
diff --git a/beemgrapheneapi/graphenerpc.py b/beemgrapheneapi/graphenerpc.py
index 0fed204a..f74a2213 100644
--- a/beemgrapheneapi/graphenerpc.py
+++ b/beemgrapheneapi/graphenerpc.py
@@ -239,7 +239,7 @@ class GrapheneRPC(object):
elif re.search("Network Authentication Required", reply) or re.search("511", reply):
raise RPCError("Network Authentication Required")
else:
- raise ValueError("Client returned invalid format. Expected JSON!")
+ raise RPCError("Client returned invalid format. Expected JSON!")
def rpcexec(self, payload):
"""
diff --git a/tests/beem/test_block.py b/tests/beem/test_block.py
index 70016bb1..ec6edf63 100644
--- a/tests/beem/test_block.py
+++ b/tests/beem/test_block.py
@@ -35,6 +35,7 @@ class Testcases(unittest.TestCase):
keys={"active": wif},
num_retries=10
)
+ self.test_block_id = 19273700
# from getpass import getpass
# self.bts.wallet.unlock(getpass())
set_shared_steem_instance(self.bts)
@@ -49,12 +50,15 @@ class Testcases(unittest.TestCase):
bts = self.bts
else:
bts = self.appbase
- block = Block(1, steem_instance=bts)
- self.assertEqual(block.identifier, 1)
+ block = Block(self.test_block_id, steem_instance=bts)
+ self.assertEqual(block.identifier, self.test_block_id)
self.assertTrue(isinstance(block.time(), datetime))
self.assertTrue(isinstance(block, dict))
- block2 = Block(2, steem_instance=bts)
+ self.assertTrue(len(block.ops()))
+ self.assertTrue(isinstance(block.ops_statistics(), dict))
+
+ block2 = Block(self.test_block_id + 1, steem_instance=bts)
self.assertTrue(block2.time() > block.time())
with self.assertRaises(
exceptions.BlockDoesNotExistsException
@@ -70,27 +74,15 @@ class Testcases(unittest.TestCase):
bts = self.bts
else:
bts = self.appbase
- block = BlockHeader(1, steem_instance=bts)
- self.assertEqual(block.identifier, 1)
+ block = BlockHeader(self.test_block_id, steem_instance=bts)
+ self.assertEqual(block.identifier, self.test_block_id)
self.assertTrue(isinstance(block.time(), datetime))
self.assertTrue(isinstance(block, dict))
- block2 = BlockHeader(2, steem_instance=bts)
+ block2 = BlockHeader(self.test_block_id + 1, steem_instance=bts)
self.assertTrue(block2.time() > block.time())
with self.assertRaises(
exceptions.BlockDoesNotExistsException
):
BlockHeader(0, steem_instance=bts)
- @parameterized.expand([
- ("non_appbase"),
- ("appbase"),
- ])
- def test_block_ops(self, node_param):
- if node_param == "non_appbase":
- bts = self.bts
- else:
- bts = self.appbase
- block = Block(20000000, steem_instance=bts)
- self.assertTrue(len(block.ops()))
- self.assertTrue(isinstance(block.ops_statistics(), dict))
--
GitLab