From 22b1cb36e6732610d3d8bee05dd1885310cacee4 Mon Sep 17 00:00:00 2001
From: Holger <holger@nahrstaedt.de>
Date: Wed, 5 Dec 2018 18:38:59 +0100
Subject: [PATCH] Remove not responding testnet node from unit tests
* testnet tests disabled
* Increase version number
---
beem/blockchain.py | 8 +--
beem/version.py | 2 +-
beemapi/version.py | 2 +-
beembase/version.py | 2 +-
beemgraphenebase/version.py | 2 +-
setup.py | 2 +-
tests/beem/test_account.py | 15 ++---
tests/beem/test_block.py | 35 ++--------
tests/beem/test_blockchain.py | 22 +------
tests/beem/test_cli.py | 83 ++++++++++++------------
tests/beem/test_conveyor.py | 14 +---
tests/beem/test_steem.py | 111 +++++++-------------------------
tests/beem/test_steemconnect.py | 18 +-----
tests/beem/test_storage.py | 22 ++-----
tests/beem/test_testnet.py | 41 +++++++++---
15 files changed, 123 insertions(+), 256 deletions(-)
diff --git a/beem/blockchain.py b/beem/blockchain.py
index f12cf0d7..dc909707 100644
--- a/beem/blockchain.py
+++ b/beem/blockchain.py
@@ -962,9 +962,7 @@ class Blockchain(object):
>>> from beem.blockchain import Blockchain
>>> blockchain = Blockchain()
>>> blockchain.list_change_recovery_account_requests(limit=1)
- [{'id': 511, 'account_to_recover': 'bott',
- 'recovery_account': 'bott', 'effective_on':
- '2018-12-18T01:46:24'}]
+ [{'id': 511, 'account_to_recover': 'bott', 'recovery_account': 'bott', 'effective_on': '2018-12-18T01:46:24'}]
"""
if not self.steem.is_connected():
@@ -990,9 +988,7 @@ class Blockchain(object):
>>> from beem.blockchain import Blockchain
>>> blockchain = Blockchain()
>>> blockchain.find_change_recovery_account_requests('bott')
- [{'id': 511, 'account_to_recover': 'bott',
- 'recovery_account': 'bott', 'effective_on':
- '2018-12-18T01:46:24'}
+ [{'id': 511, 'account_to_recover': 'bott', 'recovery_account': 'bott', 'effective_on': '2018-12-18T01:46:24'}]
"""
if not self.steem.is_connected():
diff --git a/beem/version.py b/beem/version.py
index 141da692..1d6978c5 100644
--- a/beem/version.py
+++ b/beem/version.py
@@ -1,2 +1,2 @@
"""THIS FILE IS GENERATED FROM beem SETUP.PY."""
-version = '0.20.13'
+version = '0.20.14'
diff --git a/beemapi/version.py b/beemapi/version.py
index 141da692..1d6978c5 100644
--- a/beemapi/version.py
+++ b/beemapi/version.py
@@ -1,2 +1,2 @@
"""THIS FILE IS GENERATED FROM beem SETUP.PY."""
-version = '0.20.13'
+version = '0.20.14'
diff --git a/beembase/version.py b/beembase/version.py
index 141da692..1d6978c5 100644
--- a/beembase/version.py
+++ b/beembase/version.py
@@ -1,2 +1,2 @@
"""THIS FILE IS GENERATED FROM beem SETUP.PY."""
-version = '0.20.13'
+version = '0.20.14'
diff --git a/beemgraphenebase/version.py b/beemgraphenebase/version.py
index 141da692..1d6978c5 100644
--- a/beemgraphenebase/version.py
+++ b/beemgraphenebase/version.py
@@ -1,2 +1,2 @@
"""THIS FILE IS GENERATED FROM beem SETUP.PY."""
-version = '0.20.13'
+version = '0.20.14'
diff --git a/setup.py b/setup.py
index cc05a1a2..bf4b9c79 100755
--- a/setup.py
+++ b/setup.py
@@ -16,7 +16,7 @@ except LookupError:
ascii = codecs.lookup('ascii')
codecs.register(lambda name, enc=ascii: {True: enc}.get(name == 'mbcs'))
-VERSION = '0.20.13'
+VERSION = '0.20.14'
tests_require = ['mock >= 2.0.0', 'pytest', 'pytest-mock', 'parameterized']
diff --git a/tests/beem/test_account.py b/tests/beem/test_account.py
index 5981abbf..0ec72df7 100644
--- a/tests/beem/test_account.py
+++ b/tests/beem/test_account.py
@@ -37,15 +37,6 @@ class Testcases(unittest.TestCase):
keys={"active": wif},
num_retries=10
)
- cls.testnet = Steem(
- node="https://testnet.steemitdev.com",
- nobroadcast=True,
- bundle=False,
- unsigned=True,
- # Overwrite wallet to use this list of wifs only
- keys={"active": wif},
- num_retries=10
- )
cls.account = Account("beembot", full=True, steem_instance=cls.bts)
set_shared_steem_instance(cls.bts)
@@ -495,9 +486,11 @@ class Testcases(unittest.TestCase):
def test_blog_history(self):
account = Account("holger80", steem_instance=self.bts)
posts = []
- for p in account.blog_history(limit=1):
+ for p in account.blog_history(limit=5):
+ if p["author"] != account["name"]:
+ continue
posts.append(p)
- self.assertEqual(len(posts), 1)
+ self.assertTrue(len(posts) >= 1)
self.assertEqual(posts[0]["author"], account["name"])
self.assertTrue(posts[0].is_main_post())
self.assertTrue(posts[0].depth == 0)
diff --git a/tests/beem/test_block.py b/tests/beem/test_block.py
index e5af5c4f..739151ce 100644
--- a/tests/beem/test_block.py
+++ b/tests/beem/test_block.py
@@ -26,30 +26,15 @@ class Testcases(unittest.TestCase):
keys={"active": wif},
num_retries=10
)
- cls.testnet = Steem(
- node="https://testnet.steemitdev.com",
- nobroadcast=True,
- keys={"active": wif},
- num_retries=10
- )
cls.test_block_id = 19273700
- cls.test_block_id_testnet = 10000
# from getpass import getpass
# self.bts.wallet.unlock(getpass())
set_shared_steem_instance(cls.bts)
cls.bts.set_default_account("test")
- @parameterized.expand([
- ("normal"),
- ("testnet"),
- ])
- def test_block(self, node_param):
- if node_param == "normal":
- bts = self.bts
- test_block_id = self.test_block_id
- else:
- bts = self.testnet
- test_block_id = self.test_block_id_testnet
+ def test_block(self):
+ bts = self.bts
+ test_block_id = self.test_block_id
block = Block(test_block_id, steem_instance=bts)
self.assertEqual(block.identifier, test_block_id)
self.assertTrue(isinstance(block.time(), datetime))
@@ -83,17 +68,9 @@ class Testcases(unittest.TestCase):
):
Block(0, steem_instance=bts)
- @parameterized.expand([
- ("normal"),
- ("testnet"),
- ])
- def test_block_header(self, node_param):
- if node_param == "normal":
- bts = self.bts
- test_block_id = self.test_block_id
- else:
- bts = self.testnet
- test_block_id = self.test_block_id_testnet
+ def test_block_header(self):
+ bts = self.bts
+ test_block_id = self.test_block_id
block = BlockHeader(test_block_id, steem_instance=bts)
self.assertEqual(block.identifier, test_block_id)
self.assertTrue(isinstance(block.time(), datetime))
diff --git a/tests/beem/test_blockchain.py b/tests/beem/test_blockchain.py
index fc70772d..751e8d0f 100644
--- a/tests/beem/test_blockchain.py
+++ b/tests/beem/test_blockchain.py
@@ -37,20 +37,9 @@ class Testcases(unittest.TestCase):
cls.start = num - 25
cls.stop = num
- cls.testnet = Steem(
- node="https://testnet.steemitdev.com",
- nobroadcast=True,
- keys={"active": wif},
- num_retries=10
- )
# from getpass import getpass
# self.bts.wallet.unlock(getpass())
set_shared_steem_instance(cls.bts)
- cls.bts.set_default_account("test")
- b = Blockchain(steem_instance=cls.testnet)
- num = b.get_current_block_num()
- cls.start_testnet = num - 25
- cls.stop_testnet = num
def test_blockchain(self):
bts = self.bts
@@ -92,15 +81,8 @@ class Testcases(unittest.TestCase):
self.assertEqual(len(accounts), limit)
self.assertEqual(len(set(accounts)), limit)
- @parameterized.expand([
- ("normal"),
- ("testnet"),
- ])
- def test_awaitTX(self, node_param):
- if node_param == "normal":
- bts = self.bts
- else:
- bts = self.testnet
+ def test_awaitTX(self):
+ bts = self.bts
b = Blockchain(steem_instance=bts)
trans = {'ref_block_num': 3855, 'ref_block_prefix': 1730859721,
'expiration': '2018-03-09T06:21:06', 'operations': [],
diff --git a/tests/beem/test_cli.py b/tests/beem/test_cli.py
index 44475e5a..a9c17822 100644
--- a/tests/beem/test_cli.py
+++ b/tests/beem/test_cli.py
@@ -39,7 +39,7 @@ class Testcases(unittest.TestCase):
result = runner.invoke(cli, ['-o', 'set', 'default_account', 'beem'])
if result.exit_code != 0:
raise AssertionError(str(result))
- result = runner.invoke(cli, ['-o', 'set', 'nodes', str(cls.nodelist.get_testnet())])
+ result = runner.invoke(cli, ['-o', 'set', 'nodes', str(cls.nodelist.get_nodes())])
if result.exit_code != 0:
raise AssertionError(str(result))
result = runner.invoke(cli, ['createwallet', '--wipe'], input="test\ntest\n")
@@ -62,14 +62,14 @@ class Testcases(unittest.TestCase):
def test_balance(self):
runner = CliRunner()
- runner.invoke(cli, ['set', 'nodes', str(self.nodelist.get_testnet())])
- result = runner.invoke(cli, ['balance', 'beem', 'beem1'])
+ runner.invoke(cli, ['set', 'nodes', str(self.nodelist.get_nodes())])
+ result = runner.invoke(cli, ['balance', 'beembot', 'beempy'])
self.assertEqual(result.exit_code, 0)
def test_interest(self):
runner = CliRunner()
- runner.invoke(cli, ['set', 'nodes', str(self.nodelist.get_testnet())])
- result = runner.invoke(cli, ['interest', 'beem', 'beem1'])
+ runner.invoke(cli, ['set', 'nodes', str(self.nodelist.get_nodes())])
+ result = runner.invoke(cli, ['interest', 'beembot', 'beempy'])
self.assertEqual(result.exit_code, 0)
def test_config(self):
@@ -112,10 +112,10 @@ class Testcases(unittest.TestCase):
def test_info(self):
runner = CliRunner()
- runner.invoke(cli, ['-o', 'set', 'nodes', str(self.nodelist.get_testnet())])
+ runner.invoke(cli, ['-o', 'set', 'nodes', str(self.nodelist.get_nodes())])
result = runner.invoke(cli, ['info'])
self.assertEqual(result.exit_code, 0)
- result = runner.invoke(cli, ['info', 'beem'])
+ result = runner.invoke(cli, ['info', 'beembot'])
self.assertEqual(result.exit_code, 0)
result = runner.invoke(cli, ['info', '100'])
self.assertEqual(result.exit_code, 0)
@@ -133,7 +133,7 @@ class Testcases(unittest.TestCase):
self.assertEqual(result.exit_code, 0)
result = runner.invoke(cli, ['info', "@gtg/witness-gtg-log"])
self.assertEqual(result.exit_code, 0)
- runner.invoke(cli, ['-o', 'set', 'nodes', str(self.nodelist.get_testnet())])
+ runner.invoke(cli, ['-o', 'set', 'nodes', str(self.nodelist.get_nodes())])
def test_changepassword(self):
runner = CliRunner()
@@ -175,19 +175,19 @@ class Testcases(unittest.TestCase):
def test_transfer(self):
runner = CliRunner()
- runner.invoke(cli, ['-o', 'set', 'nodes', str(self.nodelist.get_testnet())])
+ runner.invoke(cli, ['-o', 'set', 'nodes', str(self.nodelist.get_nodes())])
result = runner.invoke(cli, ['transfer', 'beem1', '1', 'SBD', 'test'], input="test\n")
self.assertEqual(result.exit_code, 0)
def test_powerdownroute(self):
runner = CliRunner()
- runner.invoke(cli, ['-o', 'set', 'nodes', str(self.nodelist.get_testnet())])
+ runner.invoke(cli, ['-o', 'set', 'nodes', str(self.nodelist.get_nodes())])
result = runner.invoke(cli, ['powerdownroute', 'beem1'], input="test\n")
self.assertEqual(result.exit_code, 0)
def test_convert(self):
runner = CliRunner()
- runner.invoke(cli, ['-o', 'set', 'nodes', str(self.nodelist.get_testnet())])
+ runner.invoke(cli, ['-o', 'set', 'nodes', str(self.nodelist.get_nodes())])
result = runner.invoke(cli, ['convert', '1'], input="test\n")
self.assertEqual(result.exit_code, 0)
@@ -198,7 +198,7 @@ class Testcases(unittest.TestCase):
def test_powerdown(self):
runner = CliRunner()
- runner.invoke(cli, ['-o', 'set', 'nodes', str(self.nodelist.get_testnet())])
+ runner.invoke(cli, ['-o', 'set', 'nodes', str(self.nodelist.get_nodes())])
result = runner.invoke(cli, ['-d', 'powerdown', '1e3'], input="test\n")
self.assertEqual(result.exit_code, 0)
result = runner.invoke(cli, ['-d', 'powerdown', '0'], input="test\n")
@@ -206,43 +206,43 @@ class Testcases(unittest.TestCase):
def test_updatememokey(self):
runner = CliRunner()
- runner.invoke(cli, ['-o', 'set', 'nodes', str(self.nodelist.get_testnet())])
+ runner.invoke(cli, ['-o', 'set', 'nodes', str(self.nodelist.get_nodes())])
result = runner.invoke(cli, ['-d', 'updatememokey'], input="test\ntest\ntest\n")
self.assertEqual(result.exit_code, 0)
def test_permissions(self):
runner = CliRunner()
- runner.invoke(cli, ['-o', 'set', 'nodes', str(self.nodelist.get_testnet())])
+ runner.invoke(cli, ['-o', 'set', 'nodes', str(self.nodelist.get_nodes())])
result = runner.invoke(cli, ['permissions', 'beem'])
self.assertEqual(result.exit_code, 0)
def test_follower(self):
runner = CliRunner()
- runner.invoke(cli, ['-o', 'set', 'nodes', str(self.nodelist.get_testnet())])
+ runner.invoke(cli, ['-o', 'set', 'nodes', str(self.nodelist.get_nodes())])
result = runner.invoke(cli, ['follower', 'beem1'])
self.assertEqual(result.exit_code, 0)
def test_following(self):
runner = CliRunner()
- runner.invoke(cli, ['-o', 'set', 'nodes', str(self.nodelist.get_testnet())])
+ runner.invoke(cli, ['-o', 'set', 'nodes', str(self.nodelist.get_nodes())])
result = runner.invoke(cli, ['following', 'beem'])
self.assertEqual(result.exit_code, 0)
def test_muter(self):
runner = CliRunner()
- runner.invoke(cli, ['-o', 'set', 'nodes', str(self.nodelist.get_testnet())])
+ runner.invoke(cli, ['-o', 'set', 'nodes', str(self.nodelist.get_nodes())])
result = runner.invoke(cli, ['muter', 'beem1'])
self.assertEqual(result.exit_code, 0)
def test_muting(self):
runner = CliRunner()
- runner.invoke(cli, ['-o', 'set', 'nodes', str(self.nodelist.get_testnet())])
+ runner.invoke(cli, ['-o', 'set', 'nodes', str(self.nodelist.get_nodes())])
result = runner.invoke(cli, ['muting', 'beem'])
self.assertEqual(result.exit_code, 0)
def test_allow_disallow(self):
runner = CliRunner()
- runner.invoke(cli, ['-o', 'set', 'nodes', str(self.nodelist.get_testnet())])
+ runner.invoke(cli, ['-o', 'set', 'nodes', str(self.nodelist.get_nodes())])
result = runner.invoke(cli, ['-d', 'allow', '--account', 'beem', '--permission', 'posting', 'beem1'], input="test\n")
self.assertEqual(result.exit_code, 0)
result = runner.invoke(cli, ['-d', 'disallow', '--account', 'beem', '--permission', 'posting', 'beem1'], input="test\n")
@@ -259,32 +259,33 @@ class Testcases(unittest.TestCase):
result = runner.invoke(cli, ['votes', '--direction', 'out', 'test'])
self.assertEqual(result.exit_code, 0)
result = runner.invoke(cli, ['votes', '--direction', 'in', 'test'])
- runner.invoke(cli, ['-o', 'set', 'nodes', str(self.nodelist.get_testnet())])
+ runner.invoke(cli, ['-o', 'set', 'nodes', str(self.nodelist.get_nodes())])
self.assertEqual(result.exit_code, 0)
def test_approvewitness(self):
runner = CliRunner()
- runner.invoke(cli, ['-o', 'set', 'nodes', str(self.nodelist.get_testnet())])
+ runner.invoke(cli, ['-o', 'set', 'nodes', str(self.nodelist.get_nodes())])
result = runner.invoke(cli, ['-o', 'approvewitness', 'beem1'], input="test\n")
self.assertEqual(result.exit_code, 0)
def test_disapprovewitness(self):
runner = CliRunner()
- runner.invoke(cli, ['-o', 'set', 'nodes', str(self.nodelist.get_testnet())])
+ runner.invoke(cli, ['-o', 'set', 'nodes', str(self.nodelist.get_nodes())])
result = runner.invoke(cli, ['-o', 'disapprovewitness', 'beem1'], input="test\n")
self.assertEqual(result.exit_code, 0)
def test_newaccount(self):
runner = CliRunner()
- runner.invoke(cli, ['-o', 'set', 'nodes', str(self.nodelist.get_testnet())])
+ runner.invoke(cli, ['-o', 'set', 'nodes', str(self.nodelist.get_nodes())])
result = runner.invoke(cli, ['-d', 'newaccount', 'beem3'], input="test\ntest\ntest\n")
self.assertEqual(result.exit_code, 0)
result = runner.invoke(cli, ['-d', 'newaccount', 'beem3'], input="test\ntest\ntest\n")
self.assertEqual(result.exit_code, 0)
+ @unittest.skip
def test_importaccount(self):
runner = CliRunner()
- runner.invoke(cli, ['-o', 'set', 'nodes', str(self.nodelist.get_testnet())])
+ runner.invoke(cli, ['-o', 'set', 'nodes', str(self.nodelist.get_nodes())])
result = runner.invoke(cli, ['importaccount', '--roles', '["owner", "active", "posting", "memo"]', 'beem2'], input="test\numybjvCafrt8LdoCjEimQiQ4\n")
self.assertEqual(result.exit_code, 0)
result = runner.invoke(cli, ['delkey', '--confirm', 'STX7mLs2hns87f7kbf3o2HBqNoEaXiTeeU89eVF6iUCrMQJFzBsPo'], input="test\n")
@@ -304,7 +305,7 @@ class Testcases(unittest.TestCase):
result = runner.invoke(cli, ['orderbook', '--show-date'])
self.assertEqual(result.exit_code, 0)
result = runner.invoke(cli, ['orderbook', '--chart'])
- runner.invoke(cli, ['-o', 'set', 'nodes', str(self.nodelist.get_testnet())])
+ runner.invoke(cli, ['-o', 'set', 'nodes', str(self.nodelist.get_nodes())])
self.assertEqual(result.exit_code, 0)
def test_buy(self):
@@ -317,7 +318,7 @@ class Testcases(unittest.TestCase):
result = runner.invoke(cli, ['-d', '-x', 'buy', '1', 'SBD', '2.2'], input="test\n")
self.assertEqual(result.exit_code, 0)
result = runner.invoke(cli, ['-d', '-x', 'buy', '1', 'SBD'], input="y\ntest\n")
- runner.invoke(cli, ['-o', 'set', 'nodes', str(self.nodelist.get_testnet())])
+ runner.invoke(cli, ['-o', 'set', 'nodes', str(self.nodelist.get_nodes())])
self.assertEqual(result.exit_code, 0)
def test_sell(self):
@@ -330,7 +331,7 @@ class Testcases(unittest.TestCase):
result = runner.invoke(cli, ['-d', '-x', 'sell', '1', 'STEEM'], input="y\ntest\n")
self.assertEqual(result.exit_code, 0)
result = runner.invoke(cli, ['-d', '-x', 'sell', '1', 'SBD'], input="y\ntest\n")
- runner.invoke(cli, ['-o', 'set', 'nodes', str(self.nodelist.get_testnet())])
+ runner.invoke(cli, ['-o', 'set', 'nodes', str(self.nodelist.get_nodes())])
self.assertEqual(result.exit_code, 0)
def test_cancel(self):
@@ -350,7 +351,7 @@ class Testcases(unittest.TestCase):
def test_follow_unfollow(self):
runner = CliRunner()
- runner.invoke(cli, ['-o', 'set', 'nodes', str(self.nodelist.get_testnet())])
+ runner.invoke(cli, ['-o', 'set', 'nodes', str(self.nodelist.get_nodes())])
result = runner.invoke(cli, ['-d', 'follow', 'beem1'], input="test\n")
self.assertEqual(result.exit_code, 0)
result = runner.invoke(cli, ['-d', 'unfollow', 'beem1'], input="test\n")
@@ -358,7 +359,7 @@ class Testcases(unittest.TestCase):
def test_mute_unmute(self):
runner = CliRunner()
- runner.invoke(cli, ['-o', 'set', 'nodes', str(self.nodelist.get_testnet())])
+ runner.invoke(cli, ['-o', 'set', 'nodes', str(self.nodelist.get_nodes())])
result = runner.invoke(cli, ['-d', 'mute', 'beem1'], input="test\n")
self.assertEqual(result.exit_code, 0)
result = runner.invoke(cli, ['-d', 'unfollow', 'beem1'], input="test\n")
@@ -366,7 +367,7 @@ class Testcases(unittest.TestCase):
def test_witnesscreate(self):
runner = CliRunner()
- runner.invoke(cli, ['-o', 'set', 'nodes', str(self.nodelist.get_testnet())])
+ runner.invoke(cli, ['-o', 'set', 'nodes', str(self.nodelist.get_nodes())])
result = runner.invoke(cli, ['-d', 'witnesscreate', 'beem', pub_key], input="test\n")
self.assertEqual(result.exit_code, 0)
@@ -397,14 +398,14 @@ class Testcases(unittest.TestCase):
runner.invoke(cli, ['-o', 'set', 'nodes', self.nodelist.get_nodes()])
result = runner.invoke(cli, ['power'])
self.assertEqual(result.exit_code, 0)
- runner.invoke(cli, ['-o', 'set', 'nodes', str(self.nodelist.get_testnet())])
+ runner.invoke(cli, ['-o', 'set', 'nodes', str(self.nodelist.get_nodes())])
def test_nextnode(self):
runner = CliRunner()
runner.invoke(cli, ['-o', 'set', 'nodes', self.nodelist.get_nodes()])
result = runner.invoke(cli, ['-o', 'nextnode'])
self.assertEqual(result.exit_code, 0)
- runner.invoke(cli, ['-o', 'set', 'nodes', str(self.nodelist.get_testnet())])
+ runner.invoke(cli, ['-o', 'set', 'nodes', str(self.nodelist.get_nodes())])
def test_pingnode(self):
runner = CliRunner()
@@ -418,7 +419,7 @@ class Testcases(unittest.TestCase):
runner.invoke(cli, ['-o', 'set', 'nodes', self.nodelist.get_nodes()])
result = runner.invoke(cli, ['updatenodes', '--test'])
self.assertEqual(result.exit_code, 0)
- runner.invoke(cli, ['-o', 'set', 'nodes', str(self.nodelist.get_testnet())])
+ runner.invoke(cli, ['-o', 'set', 'nodes', str(self.nodelist.get_nodes())])
def test_currentnode(self):
runner = CliRunner()
@@ -429,20 +430,20 @@ class Testcases(unittest.TestCase):
self.assertEqual(result.exit_code, 0)
result = runner.invoke(cli, ['currentnode', '--version'])
self.assertEqual(result.exit_code, 0)
- runner.invoke(cli, ['-o', 'set', 'nodes', str(self.nodelist.get_testnet())])
+ runner.invoke(cli, ['-o', 'set', 'nodes', str(self.nodelist.get_nodes())])
def test_ticker(self):
runner = CliRunner()
runner.invoke(cli, ['-o', 'set', 'nodes', self.nodelist.get_nodes()])
result = runner.invoke(cli, ['ticker'])
- runner.invoke(cli, ['-o', 'set', 'nodes', str(self.nodelist.get_testnet())])
+ runner.invoke(cli, ['-o', 'set', 'nodes', str(self.nodelist.get_nodes())])
self.assertEqual(result.exit_code, 0)
def test_pricehistory(self):
runner = CliRunner()
runner.invoke(cli, ['-o', 'set', 'nodes', self.nodelist.get_nodes()])
result = runner.invoke(cli, ['pricehistory'])
- runner.invoke(cli, ['-o', 'set', 'nodes', str(self.nodelist.get_testnet())])
+ runner.invoke(cli, ['-o', 'set', 'nodes', str(self.nodelist.get_nodes())])
self.assertEqual(result.exit_code, 0)
def test_pending(self):
@@ -460,7 +461,7 @@ class Testcases(unittest.TestCase):
self.assertEqual(result.exit_code, 0)
result = runner.invoke(cli, ['pending', '--post', '--comment', '--curation', '--author', '--permlink', '--length', '30', '--days', '1', 'holger80'])
self.assertEqual(result.exit_code, 0)
- runner.invoke(cli, ['-o', 'set', 'nodes', str(self.nodelist.get_testnet())])
+ runner.invoke(cli, ['-o', 'set', 'nodes', str(self.nodelist.get_nodes())])
def test_rewards(self):
runner = CliRunner()
@@ -477,13 +478,13 @@ class Testcases(unittest.TestCase):
self.assertEqual(result.exit_code, 0)
result = runner.invoke(cli, ['rewards', '--post', '--comment', '--curation', '--author', '--permlink', '--length', '30', 'holger80'])
self.assertEqual(result.exit_code, 0)
- runner.invoke(cli, ['-o', 'set', 'nodes', str(self.nodelist.get_testnet())])
+ runner.invoke(cli, ['-o', 'set', 'nodes', str(self.nodelist.get_nodes())])
def test_curation(self):
runner = CliRunner()
runner.invoke(cli, ['-o', 'set', 'nodes', self.nodelist.get_nodes()])
result = runner.invoke(cli, ['curation', "@gtg/witness-gtg-log"])
- runner.invoke(cli, ['-o', 'set', 'nodes', str(self.nodelist.get_testnet())])
+ runner.invoke(cli, ['-o', 'set', 'nodes', str(self.nodelist.get_nodes())])
self.assertEqual(result.exit_code, 0)
def test_verify(self):
@@ -495,12 +496,12 @@ class Testcases(unittest.TestCase):
self.assertEqual(result.exit_code, 0)
result = runner.invoke(cli, ['verify', '--trx', '0'])
self.assertEqual(result.exit_code, 0)
- runner.invoke(cli, ['-o', 'set', 'nodes', str(self.nodelist.get_testnet())])
+ runner.invoke(cli, ['-o', 'set', 'nodes', str(self.nodelist.get_nodes())])
self.assertEqual(result.exit_code, 0)
def test_tradehistory(self):
runner = CliRunner()
runner.invoke(cli, ['-o', 'set', 'nodes', self.nodelist.get_nodes()])
result = runner.invoke(cli, ['tradehistory'])
- runner.invoke(cli, ['-o', 'set', 'nodes', str(self.nodelist.get_testnet())])
+ runner.invoke(cli, ['-o', 'set', 'nodes', str(self.nodelist.get_nodes())])
self.assertEqual(result.exit_code, 0)
diff --git a/tests/beem/test_conveyor.py b/tests/beem/test_conveyor.py
index 7f3fba6a..aac0b2d9 100644
--- a/tests/beem/test_conveyor.py
+++ b/tests/beem/test_conveyor.py
@@ -16,8 +16,8 @@ class Testcases(unittest.TestCase):
@classmethod
def setUpClass(cls):
nodelist = NodeList()
- stm = Steem(node=nodelist.get_testnet(), nobroadcast=True,
- num_retries=10, expiration=120, keys=wif)
+ stm = Steem(node=nodelist.get_nodes(), nobroadcast=True,
+ num_retries=10, expiration=120)
set_shared_steem_instance(stm)
def test_healthcheck(self):
@@ -26,15 +26,5 @@ class Testcases(unittest.TestCase):
self.assertTrue('ok' in health)
self.assertTrue('date' in health)
- def test_get_user_data(self):
- c = Conveyor()
- userdata = c.get_user_data('beem')
- self.assertTrue('jsonrpc' in userdata)
- self.assertTrue('error' in userdata)
- self.assertTrue('code' in userdata['error'])
- # error 401 -> unauthorized, but proper format
- self.assertTrue(userdata['error']['code'] == 401)
-
-
if __name__ == "__main__":
unittest.main()
diff --git a/tests/beem/test_steem.py b/tests/beem/test_steem.py
index df18e428..c3ed5a59 100644
--- a/tests/beem/test_steem.py
+++ b/tests/beem/test_steem.py
@@ -40,28 +40,11 @@ class Testcases(unittest.TestCase):
data_refresh_time_seconds=900,
keys={"active": wif, "owner": wif, "memo": wif},
num_retries=10)
- cls.testnet = Steem(
- node="https://testnet.steemitdev.com",
- nobroadcast=True,
- unsigned=True,
- data_refresh_time_seconds=900,
- keys={"active": wif, "owner": wif, "memo": wif},
- num_retries=10)
-
cls.account = Account("test", full=True, steem_instance=cls.bts)
- cls.account_testnet = Account("test", full=True, steem_instance=cls.testnet)
- @parameterized.expand([
- ("normal"),
- ("testnet"),
- ])
- def test_transfer(self, node_param):
- if node_param == "normal":
- bts = self.bts
- acc = self.account
- elif node_param == "testnet":
- bts = self.testnet
- acc = self.account_testnet
+ def test_transfer(self):
+ bts = self.bts
+ acc = self.account
acc.steem.txbuffer.clear()
tx = acc.transfer(
"test", 1.33, "SBD", memo="Foobar", account="test1")
@@ -197,26 +180,12 @@ class Testcases(unittest.TestCase):
op["creator"],
"test")
- @parameterized.expand([
- ("normal"),
- ("testnet"),
- ])
- def test_connect(self, node_param):
- if node_param == "normal":
- bts = self.bts
- elif node_param == "testnet":
- bts = self.testnet
+ def test_connect(self):
+ bts = self.bts
bts.connect()
- @parameterized.expand([
- ("normal"),
- ("testnet"),
- ])
- def test_info(self, node_param):
- if node_param == "normal":
- bts = self.bts
- elif node_param == "testnet":
- bts = self.testnet
+ def test_info(self):
+ bts = self.bts
info = bts.info()
for key in ['current_witness',
'head_block_id',
@@ -244,19 +213,10 @@ class Testcases(unittest.TestCase):
self.assertEqual(len(ops1), 2)
self.assertEqual(len(ops2), 1)
- @parameterized.expand([
- ("normal"),
- ("testnet"),
- ])
- def test_weight_threshold(self, node_param):
- if node_param == "normal":
+ def test_weight_threshold(self):
bts = self.bts
pkey1 = 'STM55VCzsb47NZwWe5F3qyQKedX9iHBHMVVFSc96PDvV7wuj7W86n'
pkey2 = 'STM7GM9YXcsoAJAgKbqW2oVj7bnNXFNL4pk9NugqKWPmuhoEDbkDv'
- elif node_param == "testnet":
- bts = self.testnet
- pkey1 = 'TST55VCzsb47NZwWe5F3qyQKedX9iHBHMVVFSc96PDvV7wuj7W86n'
- pkey2 = 'TST7GM9YXcsoAJAgKbqW2oVj7bnNXFNL4pk9NugqKWPmuhoEDbkDv'
auth = {'account_auths': [['test', 1]],
'extensions': [],
@@ -275,21 +235,12 @@ class Testcases(unittest.TestCase):
with self.assertRaises(ValueError):
bts._test_weights_treshold(auth)
- @parameterized.expand([
- ("normal"),
- ("testnet"),
- ])
- def test_allow(self, node_param):
- if node_param == "normal":
- bts = self.bts
- acc = self.account
- prefix = "STM"
- wif = "STM55VCzsb47NZwWe5F3qyQKedX9iHBHMVVFSc96PDvV7wuj7W86n"
- elif node_param == "testnet":
- bts = self.testnet
- acc = self.account_testnet
- prefix = "TST"
- wif = "TST55VCzsb47NZwWe5F3qyQKedX9iHBHMVVFSc96PDvV7wuj7W86n"
+ def test_allow(self):
+ bts = self.bts
+ acc = self.account
+ prefix = "STM"
+ wif = "STM55VCzsb47NZwWe5F3qyQKedX9iHBHMVVFSc96PDvV7wuj7W86n"
+
self.assertIn(bts.prefix, prefix)
tx = acc.allow(
wif,
@@ -348,15 +299,8 @@ class Testcases(unittest.TestCase):
op["memo_key"],
pkey)
- @parameterized.expand([
- ("normal"),
- ("testnet"),
- ])
- def test_approvewitness(self, node_param):
- if node_param == "normal":
- w = self.account
- elif node_param == "testnet":
- w = self.account_testnet
+ def test_approvewitness(self):
+ w = self.account
w.steem.txbuffer.clear()
tx = w.approvewitness("test1")
self.assertEqual(
@@ -439,23 +383,12 @@ class Testcases(unittest.TestCase):
self.assertEqual(bts.get_block_interval(), 3)
self.assertEqual(bts.get_blockchain_version(), '0.0.0')
- @parameterized.expand([
- ("normal"),
- ("testnet"),
- ])
- def test_properties(self, node_param):
- if node_param == "normal":
- bts = Steem(node=self.nodelist.get_nodes(),
- nobroadcast=True,
- data_refresh_time_seconds=900,
- keys={"active": wif, "owner": wif, "memo": wif},
- num_retries=10)
- elif node_param == "testnet":
- bts = Steem(node="https://testnet.steemitdev.com",
- nobroadcast=True,
- data_refresh_time_seconds=900,
- keys={"active": wif, "owner": wif, "memo": wif},
- num_retries=10)
+ def test_properties(self):
+ bts = Steem(node=self.nodelist.get_nodes(),
+ nobroadcast=True,
+ data_refresh_time_seconds=900,
+ keys={"active": wif, "owner": wif, "memo": wif},
+ num_retries=10)
self.assertTrue(bts.get_feed_history(use_stored_data=False) is not None)
self.assertTrue(bts.get_reward_funds(use_stored_data=False) is not None)
self.assertTrue(bts.get_current_median_history(use_stored_data=False) is not None)
diff --git a/tests/beem/test_steemconnect.py b/tests/beem/test_steemconnect.py
index 8fbc843c..453186e8 100644
--- a/tests/beem/test_steemconnect.py
+++ b/tests/beem/test_steemconnect.py
@@ -39,15 +39,8 @@ class Testcases(unittest.TestCase):
unsigned=True,
data_refresh_time_seconds=900,
num_retries=10)
- cls.testnet = Steem(
- node="https://testnet.steemitdev.com",
- nobroadcast=True,
- unsigned=True,
- data_refresh_time_seconds=900,
- num_retries=10)
cls.account = Account("test", full=True, steem_instance=cls.bts)
- cls.account_testnet = Account("test", full=True, steem_instance=cls.testnet)
def test_transfer(self):
bts = self.bts
@@ -68,15 +61,8 @@ class Testcases(unittest.TestCase):
self.assertEqual(len(url_parts), 4)
self.assertEqual(len(list(set(url_parts).intersection(set(url_test_parts)))), 4)
- @parameterized.expand([
- ("normal"),
- ("testnet"),
- ])
- def test_login_url(self, node_param):
- if node_param == "normal":
- bts = self.bts
- elif node_param == "testnet":
- bts = self.testnet
+ def test_login_url(self):
+ bts = self.bts
sc2 = SteemConnect(steem_instance=bts)
url = sc2.get_login_url("localhost", scope="login,vote")
url_test = 'https://steemconnect.com/oauth2/authorize?client_id=None&redirect_uri=localhost&scope=login,vote'
diff --git a/tests/beem/test_storage.py b/tests/beem/test_storage.py
index 36133c48..030a4945 100644
--- a/tests/beem/test_storage.py
+++ b/tests/beem/test_storage.py
@@ -43,12 +43,7 @@ class Testcases(unittest.TestCase):
num_retries=10
# Overwrite wallet to use this list of wifs only
)
- cls.testnet = Steem(
- node="https://testnet.steemitdev.com",
- nobroadcast=True,
- bundle=True,
- num_retries=10
- )
+
cls.stm.set_default_account("test")
set_shared_steem_instance(cls.stm)
# self.stm.newWallet("TestingOneTwoThree")
@@ -64,15 +59,8 @@ class Testcases(unittest.TestCase):
stm = shared_steem_instance()
stm.config.recover_with_latest_backup()
- @parameterized.expand([
- ("normal"),
- ("testnet"),
- ])
- def test_set_default_account(self, node_param):
- if node_param == "normal":
- stm = self.stm
- elif node_param == "testnet":
- stm = self.testnet
- stm.set_default_account("test")
+ def test_set_default_account(self):
+ stm = self.stm
+ stm.set_default_account("beembot")
- self.assertEqual(stm.config["default_account"], "test")
+ self.assertEqual(stm.config["default_account"], "beembot")
diff --git a/tests/beem/test_testnet.py b/tests/beem/test_testnet.py
index 8fdea0a9..eba264fa 100644
--- a/tests/beem/test_testnet.py
+++ b/tests/beem/test_testnet.py
@@ -43,8 +43,10 @@ class Testcases(unittest.TestCase):
nodelist = NodeList()
# stm = shared_steem_instance()
# stm.config.refreshBackup()
+ # nodes = nodelist.get_testnet()
+ cls.nodes = nodelist.get_nodes()
cls.bts = Steem(
- node=nodelist.get_testnet(),
+ node=cls.nodes,
nobroadcast=True,
num_retries=10,
expiration=120,
@@ -89,6 +91,7 @@ class Testcases(unittest.TestCase):
stm = shared_steem_instance()
stm.config.recover_with_latest_backup()
+ @unittest.skip
def test_wallet_keys(self):
stm = self.bts
stm.wallet.unlock("123")
@@ -109,6 +112,7 @@ class Testcases(unittest.TestCase):
priv_key = stm.wallet.getKeyForAccount("beem5", "active")
self.assertEqual(str(priv_key), self.active_private_key_of_beem5)
+ @unittest.skip
def test_transfer(self):
bts = self.bts
bts.nobroadcast = False
@@ -131,6 +135,7 @@ class Testcases(unittest.TestCase):
self.assertEqual(float(amount), 1.33)
bts.nobroadcast = True
+ @unittest.skip
def test_transfer_memo(self):
bts = self.bts
bts.nobroadcast = False
@@ -290,7 +295,7 @@ class Testcases(unittest.TestCase):
# funds but sign the transaction with elf's key and then serialize the transaction
# and deserialize the transaction. After that, sign with beem4's key.
steem = Steem(
- node=nodelist.get_testnet(),
+ node=self.nodes,
num_retries=10,
keys=[self.active_private_key_of_beem5],
expiration=360,
@@ -312,7 +317,7 @@ class Testcases(unittest.TestCase):
del tx
steem = Steem(
- node=nodelist.get_testnet(),
+ node=self.nodes,
num_retries=10,
keys=[self.active_private_key_of_beem4],
expiration=360,
@@ -339,6 +344,7 @@ class Testcases(unittest.TestCase):
tx.verify_authority()
self.assertTrue(len(tx["signatures"]) > 0)
+ @unittest.skip
def test_create_account(self):
bts = self.bts
name = ''.join(random.choice(string.ascii_lowercase) for _ in range(12))
@@ -389,15 +395,18 @@ class Testcases(unittest.TestCase):
op["creator"],
"beem")
+ @unittest.skip
def test_connect(self):
nodelist = NodeList()
- self.bts.connect(node=nodelist.get_testnet())
+ self.bts.connect(node=self.nodes)
bts = self.bts
self.assertEqual(bts.prefix, "STX")
+ @unittest.skip
def test_set_default_account(self):
self.bts.set_default_account("beem")
+ @unittest.skip
def test_info(self):
info = self.bts.info()
for key in ['current_witness',
@@ -410,6 +419,7 @@ class Testcases(unittest.TestCase):
'time']:
self.assertTrue(key in info)
+ @unittest.skip
def test_finalizeOps(self):
bts = self.bts
tx1 = bts.new_tx()
@@ -426,6 +436,7 @@ class Testcases(unittest.TestCase):
self.assertEqual(len(ops1), 2)
self.assertEqual(len(ops2), 1)
+ @unittest.skip
def test_weight_threshold(self):
bts = self.bts
auth = {'account_auths': [['test', 1]],
@@ -445,6 +456,7 @@ class Testcases(unittest.TestCase):
with self.assertRaises(ValueError):
bts._test_weights_treshold(auth)
+ @unittest.skip
def test_allow(self):
bts = self.bts
self.assertIn(bts.prefix, "STX")
@@ -468,6 +480,7 @@ class Testcases(unittest.TestCase):
op["active"]["key_auths"])
self.assertEqual(op["active"]["weight_threshold"], 1)
+ @unittest.skip
def test_disallow(self):
bts = self.bts
acc = Account("beem", steem_instance=bts)
@@ -490,6 +503,7 @@ class Testcases(unittest.TestCase):
permission="active"
)
+ @unittest.skip
def test_update_memo_key(self):
bts = self.bts
bts.wallet.unlock("123")
@@ -505,6 +519,7 @@ class Testcases(unittest.TestCase):
op["memo_key"],
"STX55VCzsb47NZwWe5F3qyQKedX9iHBHMVVFSc96PDvV7wuj7W86n")
+ @unittest.skip
def test_approvewitness(self):
bts = self.bts
w = Account("beem", steem_instance=bts)
@@ -518,9 +533,10 @@ class Testcases(unittest.TestCase):
"beem1",
op["witness"])
+ @unittest.skip
def test_appendWif(self):
nodelist = NodeList()
- stm = Steem(node=nodelist.get_testnet(),
+ stm = Steem(node=self.nodes,
nobroadcast=True,
expiration=120,
num_retries=10)
@@ -541,9 +557,10 @@ class Testcases(unittest.TestCase):
tx.sign()
self.assertTrue(len(tx["signatures"]) > 0)
+ @unittest.skip
def test_appendSigner(self):
nodelist = NodeList()
- stm = Steem(node=nodelist.get_testnet(),
+ stm = Steem(node=self.nodes,
keys=[self.active_key],
nobroadcast=True,
expiration=120,
@@ -566,7 +583,7 @@ class Testcases(unittest.TestCase):
@unittest.skip
def test_verifyAuthorityException(self):
nodelist = NodeList()
- stm = Steem(node=nodelist.get_testnet(),
+ stm = Steem(node=self.nodes,
keys=[self.posting_key],
nobroadcast=True,
expiration=120,
@@ -587,9 +604,10 @@ class Testcases(unittest.TestCase):
tx.verify_authority()
self.assertTrue(len(tx["signatures"]) > 0)
+ @unittest.skip
def test_Transfer_broadcast(self):
nodelist = NodeList()
- stm = Steem(node=nodelist.get_testnet(),
+ stm = Steem(node=self.nodes,
keys=[self.active_key],
nobroadcast=True,
expiration=120,
@@ -604,6 +622,7 @@ class Testcases(unittest.TestCase):
tx.sign()
tx.broadcast()
+ @unittest.skip
def test_TransactionConstructor(self):
stm = self.bts
opTransfer = Transfer(**{"from": "beem",
@@ -623,9 +642,10 @@ class Testcases(unittest.TestCase):
tx.sign()
self.assertTrue(len(tx["signatures"]) > 0)
+ @unittest.skip
def test_follow_active_key(self):
nodelist = NodeList()
- stm = Steem(node=nodelist.get_testnet(),
+ stm = Steem(node=self.nodes,
keys=[self.active_key],
nobroadcast=True,
expiration=120,
@@ -633,9 +653,10 @@ class Testcases(unittest.TestCase):
account = Account("beem", steem_instance=stm)
account.follow("beem1")
+ @unittest.skip
def test_follow_posting_key(self):
nodelist = NodeList()
- stm = Steem(node=nodelist.get_testnet(),
+ stm = Steem(node=self.nodes,
keys=[self.posting_key],
nobroadcast=True,
expiration=120,
--
GitLab