From 500f9a864aa184d591b7a8fc1dc15ae7a9f448af Mon Sep 17 00:00:00 2001
From: Holger <holger@nahrstaedt.de>
Date: Wed, 30 Jan 2019 15:16:08 +0100
Subject: [PATCH] Fix unittests
* Remove not working steemitdev testnet
* exclude api.steemit.com from some tests
---
beem/version.py | 2 +-
beemapi/version.py | 2 +-
beembase/version.py | 2 +-
beemgraphenebase/version.py | 2 +-
setup.py | 2 +-
tests/beem/test_account.py | 5 ++++-
tests/beem/test_amount.py | 4 ++--
tests/beem/test_asset.py | 19 +++++++++++++------
tests/beem/test_cli.py | 11 +++++++----
tests/beem/test_comment.py | 9 ++++++---
tests/beem/test_connection.py | 8 +++++---
tests/beem/test_discussions.py | 5 ++++-
12 files changed, 46 insertions(+), 25 deletions(-)
diff --git a/beem/version.py b/beem/version.py
index 5c873a03..b9d54471 100644
--- a/beem/version.py
+++ b/beem/version.py
@@ -1,2 +1,2 @@
"""THIS FILE IS GENERATED FROM beem SETUP.PY."""
-version = '0.20.17'
+version = '0.20.18'
diff --git a/beemapi/version.py b/beemapi/version.py
index 5c873a03..b9d54471 100644
--- a/beemapi/version.py
+++ b/beemapi/version.py
@@ -1,2 +1,2 @@
"""THIS FILE IS GENERATED FROM beem SETUP.PY."""
-version = '0.20.17'
+version = '0.20.18'
diff --git a/beembase/version.py b/beembase/version.py
index 5c873a03..b9d54471 100644
--- a/beembase/version.py
+++ b/beembase/version.py
@@ -1,2 +1,2 @@
"""THIS FILE IS GENERATED FROM beem SETUP.PY."""
-version = '0.20.17'
+version = '0.20.18'
diff --git a/beemgraphenebase/version.py b/beemgraphenebase/version.py
index 5c873a03..b9d54471 100644
--- a/beemgraphenebase/version.py
+++ b/beemgraphenebase/version.py
@@ -1,2 +1,2 @@
"""THIS FILE IS GENERATED FROM beem SETUP.PY."""
-version = '0.20.17'
+version = '0.20.18'
diff --git a/setup.py b/setup.py
index 0e22cdfe..24fb8dd4 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.17'
+VERSION = '0.20.18'
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 fcc88eea..3b97bb74 100644
--- a/tests/beem/test_account.py
+++ b/tests/beem/test_account.py
@@ -28,8 +28,11 @@ class Testcases(unittest.TestCase):
def setUpClass(cls):
nodelist = NodeList()
nodelist.update_nodes(steem_instance=Steem(node=nodelist.get_nodes(normal=True, appbase=True), num_retries=10))
+ node_list = nodelist.get_nodes()
+ if "https://api.steemit.com" in node_list:
+ node_list.remove("https://api.steemit.com")
cls.bts = Steem(
- node=nodelist.get_nodes(),
+ node=node_list,
nobroadcast=True,
bundle=False,
unsigned=True,
diff --git a/tests/beem/test_amount.py b/tests/beem/test_amount.py
index 22e357d4..530ce4f6 100644
--- a/tests/beem/test_amount.py
+++ b/tests/beem/test_amount.py
@@ -22,8 +22,8 @@ class Testcases(unittest.TestCase):
nobroadcast=True,
num_retries=10
)
- cls.testnet = Steem(
- node="https://testnet.steemitdev.com",
+ cls.steemit = Steem(
+ node="https://api.steemit.com",
nobroadcast=True,
use_condenser=False,
num_retries=10
diff --git a/tests/beem/test_asset.py b/tests/beem/test_asset.py
index 11a44a30..b94ba294 100644
--- a/tests/beem/test_asset.py
+++ b/tests/beem/test_asset.py
@@ -23,8 +23,8 @@ class Testcases(unittest.TestCase):
nobroadcast=True,
num_retries=10
)
- cls.testnet = Steem(
- node="https://testnet.steemitdev.com",
+ cls.steemit = Steem(
+ node="https://api.steemit.com",
nobroadcast=True,
num_retries=10
)
@@ -32,13 +32,13 @@ class Testcases(unittest.TestCase):
@parameterized.expand([
("normal"),
- ("testnet"),
+ ("steemit"),
])
def test_assert(self, node_param):
if node_param == "normal":
stm = self.bts
else:
- stm = self.testnet
+ stm = self.steemit
with self.assertRaises(AssetDoesNotExistsException):
Asset("FOObarNonExisting", full=False, steem_instance=stm)
@@ -60,8 +60,15 @@ class Testcases(unittest.TestCase):
self.assertEqual(asset.precision, precision)
self.assertEqual(asset.asset, asset_str)
- def test_assert_equal(self):
- stm = self.bts
+ @parameterized.expand([
+ ("normal"),
+ ("steemit"),
+ ])
+ def test_assert_equal(self, node_param):
+ if node_param == "normal":
+ stm = self.bts
+ else:
+ stm = self.steemit
asset1 = Asset("SBD", full=False, steem_instance=stm)
asset2 = Asset("SBD", full=False, steem_instance=stm)
self.assertTrue(asset1 == asset2)
diff --git a/tests/beem/test_cli.py b/tests/beem/test_cli.py
index 3f6be542..978ec4cb 100644
--- a/tests/beem/test_cli.py
+++ b/tests/beem/test_cli.py
@@ -27,9 +27,12 @@ pub_key = "STX52xMqKegLk4tdpNcUXU9Rw5DtdM9fxf3f12Gp55v1UjLX3ELZf"
class Testcases(unittest.TestCase):
@classmethod
def setUpClass(cls):
- cls.nodelist = NodeList()
- cls.nodelist.update_nodes()
- cls.nodelist.update_nodes(steem_instance=Steem(node=cls.nodelist.get_nodes(normal=True, appbase=True), num_retries=10))
+ nodelist = NodeList()
+ nodelist.update_nodes()
+ nodelist.update_nodes(steem_instance=Steem(node=cls.nodelist.get_nodes(normal=True, appbase=True), num_retries=10))
+ cls.node_list = nodelist.get_nodes()
+ if "https://api.steemit.com" in cls.node_list:
+ cls.node_list.remove("https://api.steemit.com")
# stm = shared_steem_instance()
# stm.config.refreshBackup()
runner = CliRunner()
@@ -39,7 +42,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_nodes())])
+ result = runner.invoke(cli, ['-o', 'set', 'nodes', str(cls.node_list)])
if result.exit_code != 0:
raise AssertionError(str(result))
result = runner.invoke(cli, ['createwallet', '--wipe'], input="test\ntest\n")
diff --git a/tests/beem/test_comment.py b/tests/beem/test_comment.py
index df767971..387c6ecb 100644
--- a/tests/beem/test_comment.py
+++ b/tests/beem/test_comment.py
@@ -22,16 +22,19 @@ class Testcases(unittest.TestCase):
def setUpClass(cls):
nodelist = NodeList()
nodelist.update_nodes(steem_instance=Steem(node=nodelist.get_nodes(normal=True, appbase=True), num_retries=10))
+ node_list = nodelist.get_nodes()
+ if "https://api.steemit.com" in node_list:
+ node_list.remove("https://api.steemit.com")
cls.bts = Steem(
- node=nodelist.get_nodes(),
+ node=node_list,
use_condenser=True,
nobroadcast=True,
unsigned=True,
keys={"active": wif},
num_retries=10
)
- cls.testnet = Steem(
- node="https://testnet.steemitdev.com",
+ cls.steemit = Steem(
+ node="https://api.steemit.com",
nobroadcast=True,
unsigned=True,
keys={"active": wif},
diff --git a/tests/beem/test_connection.py b/tests/beem/test_connection.py
index 169df547..ae1b2608 100644
--- a/tests/beem/test_connection.py
+++ b/tests/beem/test_connection.py
@@ -15,13 +15,15 @@ class Testcases(unittest.TestCase):
nodelist = NodeList()
nodelist.update_nodes(steem_instance=Steem(node=nodelist.get_nodes(normal=True, appbase=True), num_retries=10))
b1 = Steem(
- node=nodelist.get_testnet(testnet=False, testnetdev=True),
+ node="https://api.steemit.com",
nobroadcast=True,
num_retries=10
)
-
+ node_list = nodelist.get_nodes()
+ if "https://api.steemit.com" in node_list:
+ node_list.remove("https://api.steemit.com")
b2 = Steem(
- node=nodelist.get_nodes(),
+ node=node_list,
nobroadcast=True,
num_retries=10
)
diff --git a/tests/beem/test_discussions.py b/tests/beem/test_discussions.py
index dec8b690..2fae4f50 100644
--- a/tests/beem/test_discussions.py
+++ b/tests/beem/test_discussions.py
@@ -26,8 +26,11 @@ class Testcases(unittest.TestCase):
def setUpClass(cls):
nodelist = NodeList()
nodelist.update_nodes(steem_instance=Steem(node=nodelist.get_nodes(normal=True, appbase=True), num_retries=10))
+ node_list = nodelist.get_nodes()
+ if "https://api.steemit.com" in node_list:
+ node_list.remove("https://api.steemit.com")
cls.bts = Steem(
- node=nodelist.get_nodes(),
+ node=node_list,
use_condenser=True,
nobroadcast=True,
keys={"active": wif},
--
GitLab