This commit is contained in:
Bert Blommers 2020-11-11 15:55:37 +00:00
commit 273ca63d59
92 changed files with 515 additions and 1200 deletions

View file

@ -183,8 +183,7 @@ def test_create_another_member_withopts():
# But cannot get
response = conn.get_member.when.called_with(
NetworkId=network_id,
MemberId=member_id2,
NetworkId=network_id, MemberId=member_id2,
).should.throw(Exception, "Member {0} not found".format(member_id2))
# Delete member 1
@ -256,9 +255,7 @@ def test_invite_and_remove_member():
# Create proposal (invite and remove member)
response = conn.create_proposal(
NetworkId=network_id,
MemberId=member_id,
Actions=both_policy_actions,
NetworkId=network_id, MemberId=member_id, Actions=both_policy_actions,
)
proposal_id2 = response["ProposalId"]
@ -371,10 +368,7 @@ def test_create_too_many_members():
MemberConfiguration=helpers.create_member_configuration(
"testmember6", "admin", "Admin12345", False, "Test Member 6"
),
).should.throw(
Exception,
"is the maximum number of members allowed in a",
)
).should.throw(Exception, "is the maximum number of members allowed in a",)
@mock_managedblockchain
@ -600,8 +594,7 @@ def test_get_member_badmember():
network_id = response["NetworkId"]
response = conn.get_member.when.called_with(
NetworkId=network_id,
MemberId="m-ABCDEFGHIJKLMNOP0123456789",
NetworkId=network_id, MemberId="m-ABCDEFGHIJKLMNOP0123456789",
).should.throw(Exception, "Member m-ABCDEFGHIJKLMNOP0123456789 not found")
@ -631,8 +624,7 @@ def test_delete_member_badmember():
network_id = response["NetworkId"]
response = conn.delete_member.when.called_with(
NetworkId=network_id,
MemberId="m-ABCDEFGHIJKLMNOP0123456789",
NetworkId=network_id, MemberId="m-ABCDEFGHIJKLMNOP0123456789",
).should.throw(Exception, "Member m-ABCDEFGHIJKLMNOP0123456789 not found")

View file

@ -58,9 +58,7 @@ def test_create_node():
# Delete node
conn.delete_node(
NetworkId=network_id,
MemberId=member_id,
NodeId=node_id,
NetworkId=network_id, MemberId=member_id, NodeId=node_id,
)
# Find node in full list
@ -79,9 +77,7 @@ def test_create_node():
# But cannot get
response = conn.get_node.when.called_with(
NetworkId=network_id,
MemberId=member_id,
NodeId=node_id,
NetworkId=network_id, MemberId=member_id, NodeId=node_id,
).should.throw(Exception, "Node {0} not found".format(node_id))
@ -107,9 +103,7 @@ def test_create_node_standard_edition():
logconfigbad = dict(helpers.default_nodeconfiguration)
logconfigbad["InstanceType"] = "bc.t3.large"
response = conn.create_node(
NetworkId=network_id,
MemberId=member_id,
NodeConfiguration=logconfigbad,
NetworkId=network_id, MemberId=member_id, NodeConfiguration=logconfigbad,
)
node_id = response["NodeId"]
@ -152,8 +146,7 @@ def test_create_node_standard_edition():
# Should now be an exception
response = conn.list_nodes.when.called_with(
NetworkId=network_id,
MemberId=member_id,
NetworkId=network_id, MemberId=member_id,
).should.throw(Exception, "Member {0} not found".format(member_id))
@ -199,8 +192,7 @@ def test_create_too_many_nodes():
MemberId=member_id,
NodeConfiguration=helpers.default_nodeconfiguration,
).should.throw(
Exception,
"Maximum number of nodes exceeded in member {0}".format(member_id),
Exception, "Maximum number of nodes exceeded in member {0}".format(member_id),
)
@ -257,18 +249,14 @@ def test_create_node_badnodeconfig():
logconfigbad = dict(helpers.default_nodeconfiguration)
logconfigbad["InstanceType"] = "foo"
response = conn.create_node.when.called_with(
NetworkId=network_id,
MemberId=member_id,
NodeConfiguration=logconfigbad,
NetworkId=network_id, MemberId=member_id, NodeConfiguration=logconfigbad,
).should.throw(Exception, "Requested instance foo isn't supported.")
# Incorrect instance type for edition
logconfigbad = dict(helpers.default_nodeconfiguration)
logconfigbad["InstanceType"] = "bc.t3.large"
response = conn.create_node.when.called_with(
NetworkId=network_id,
MemberId=member_id,
NodeConfiguration=logconfigbad,
NetworkId=network_id, MemberId=member_id, NodeConfiguration=logconfigbad,
).should.throw(
Exception,
"Instance type bc.t3.large is not supported with STARTER Edition networks",
@ -278,9 +266,7 @@ def test_create_node_badnodeconfig():
logconfigbad = dict(helpers.default_nodeconfiguration)
logconfigbad["AvailabilityZone"] = "us-east-11"
response = conn.create_node.when.called_with(
NetworkId=network_id,
MemberId=member_id,
NodeConfiguration=logconfigbad,
NetworkId=network_id, MemberId=member_id, NodeConfiguration=logconfigbad,
).should.throw(Exception, "Availability Zone is not valid")
@ -310,8 +296,7 @@ def test_list_nodes_badmember():
network_id = response["NetworkId"]
response = conn.list_nodes.when.called_with(
NetworkId=network_id,
MemberId="m-ABCDEFGHIJKLMNOP0123456789",
NetworkId=network_id, MemberId="m-ABCDEFGHIJKLMNOP0123456789",
).should.throw(Exception, "Member m-ABCDEFGHIJKLMNOP0123456789 not found")

View file

@ -131,9 +131,7 @@ def test_create_proposal_badinvitationacctid():
member_id = response["MemberId"]
response = conn.create_proposal.when.called_with(
NetworkId=network_id,
MemberId=member_id,
Actions=actions,
NetworkId=network_id, MemberId=member_id, Actions=actions,
).should.throw(Exception, "Account ID format specified in proposal is not valid")
@ -157,9 +155,7 @@ def test_create_proposal_badremovalmemid():
member_id = response["MemberId"]
response = conn.create_proposal.when.called_with(
NetworkId=network_id,
MemberId=member_id,
Actions=actions,
NetworkId=network_id, MemberId=member_id, Actions=actions,
).should.throw(Exception, "Member ID format specified in proposal is not valid")
@ -198,6 +194,5 @@ def test_get_proposal_badproposal():
network_id = response["NetworkId"]
response = conn.get_proposal.when.called_with(
NetworkId=network_id,
ProposalId="p-ABCDEFGHIJKLMNOP0123456789",
NetworkId=network_id, ProposalId="p-ABCDEFGHIJKLMNOP0123456789",
).should.throw(Exception, "Proposal p-ABCDEFGHIJKLMNOP0123456789 not found")

View file

@ -666,6 +666,5 @@ def test_list_proposal_votes_badproposal():
member_id = response["MemberId"]
response = conn.list_proposal_votes.when.called_with(
NetworkId=network_id,
ProposalId="p-ABCDEFGHIJKLMNOP0123456789",
NetworkId=network_id, ProposalId="p-ABCDEFGHIJKLMNOP0123456789",
).should.throw(Exception, "Proposal p-ABCDEFGHIJKLMNOP0123456789 not found")