Yasuke/moto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make Moto (tests) compatible with flask/werkzeug 2.x (#3923)

Browse Source 
* Dont fail if CodeCov fails - for now

* CI - Force cache rebuild

* Bump werkzeug to latest version

* CI - Enforce cache flush

* ManagedBlockchain - fix error format

* ManagedBlockchain - Fix tests to use pytest.raises paradigm

* Revert "Lock Flask (#3925)"

This reverts commit 8bb0feb956.

* CI - Enforce cache rebuild
This commit is contained in:
Bert Blommers 2021-05-13 10:36:56 +01:00 committed by GitHub
parent 8bb0feb956
commit 9e3faf7784
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 599 additions and 317 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.github/workflows/build.yml vendored
View File

@ -26,7 +26,7 @@ jobs:
uses: actions/cache@v2 uses: actions/cache@v2
with: with:
path: ${{ steps.pip-cache-dir.outputs.dir }} path: ${{ steps.pip-cache-dir.outputs.dir }}
key: pip-${{ matrix.python-version }}-${{ hashFiles('**/setup.py') }} key: pip-${{ matrix.python-version }}-${{ hashFiles('**/setup.py') }}-4
- name: Update pip - name: Update pip
if: ${{ steps.pip-cache.outputs.cache-hit != 'true' && matrix.python-version != '2.7' }} if: ${{ steps.pip-cache.outputs.cache-hit != 'true' && matrix.python-version != '2.7' }}
run: | run: |
@ -58,7 +58,7 @@ jobs:
uses: actions/cache@v2 uses: actions/cache@v2
with: with:
path: ${{ steps.pip-cache.outputs.dir }} path: ${{ steps.pip-cache.outputs.dir }}
key: pip-${{ matrix.python-version }}-${{ hashFiles('**/setup.py') }} key: pip-${{ matrix.python-version }}-${{ hashFiles('**/setup.py') }}-4
# Update PIP - recent version does not support PY2 though # Update PIP - recent version does not support PY2 though
- name: Update pip - name: Update pip
if: ${{ matrix.python-version != '2.7' }} if: ${{ matrix.python-version != '2.7' }}
@ -97,7 +97,7 @@ jobs:
uses: actions/cache@v2 uses: actions/cache@v2
with: with:
path: ${{ steps.pip-cache.outputs.dir }} path: ${{ steps.pip-cache.outputs.dir }}
key: pip-${{ matrix.python-version }}-${{ hashFiles('**/setup.py') }} key: pip-${{ matrix.python-version }}-${{ hashFiles('**/setup.py') }}-4
- name: Update pip - name: Update pip
if: ${{ matrix.python-version != '2.7' }} if: ${{ matrix.python-version != '2.7' }}
run: | run: |
@ -113,7 +113,7 @@ jobs:
if: ${{ github.repository == 'spulec/moto'}} if: ${{ github.repository == 'spulec/moto'}}
uses: codecov/codecov-action@v1 uses: codecov/codecov-action@v1
with: with:
fail_ci_if_error: true fail_ci_if_error: false
flags: unittests flags: unittests
testserver: testserver:
@ -145,7 +145,7 @@ jobs:
uses: actions/cache@v2 uses: actions/cache@v2
with: with:
path: ${{ steps.pip-cache.outputs.dir }} path: ${{ steps.pip-cache.outputs.dir }}
key: pip-${{ matrix.python-version }}-${{ hashFiles('**/setup.py') }} key: pip-${{ matrix.python-version }}-${{ hashFiles('**/setup.py') }}-4
- name: Update pip - name: Update pip
if: ${{ matrix.python-version != '2.7' }} if: ${{ matrix.python-version != '2.7' }}
run: | run: |
@ -162,7 +162,7 @@ jobs:
if: ${{ github.repository == 'spulec/moto'}} if: ${{ github.repository == 'spulec/moto'}}
uses: codecov/codecov-action@v1 uses: codecov/codecov-action@v1
with: with:
fail_ci_if_error: true fail_ci_if_error: false
flags: servertests flags: servertests
deploy: deploy:

49
moto/managedblockchain/exceptions.py
View File

@ -1,10 +1,55 @@
from __future__ import unicode_literals from __future__ import unicode_literals
from moto.core.exceptions import RESTError from functools import wraps
from werkzeug.exceptions import HTTPException
from jinja2 import DictLoader, Environment
class ManagedBlockchainClientError(RESTError): ERROR_JSON_RESPONSE = """{
"message": "{{message}}"
}
"""
def exception_handler(f):
@wraps(f)
def _wrapper(*args, **kwargs):
try:
return f(*args, **kwargs)
except ManagedBlockchainClientError as err:
return err.code, err.get_headers(), err.description
return _wrapper
class ManagedBlockchainClientError(HTTPException):
code = 400 code = 400
templates = {
"error": ERROR_JSON_RESPONSE,
}
def __init__(self, error_type, message, **kwargs):
super(HTTPException, self).__init__()
env = Environment(loader=DictLoader(self.templates))
self.error_type = error_type
self.message = message
self.description = env.get_template("error").render(
error_type=error_type, message=message, **kwargs
)
def get_headers(self, *args, **kwargs):
return [
("Content-Type", "application/json"),
("x-amzn-ErrorType", self.error_type),
]
@property
def response(self):
return self.get_body()
def get_body(self, *args, **kwargs):
return self.description
class BadRequestException(ManagedBlockchainClientError): class BadRequestException(ManagedBlockchainClientError):
def __init__(self, pretty_called_method, operation_error): def __init__(self, pretty_called_method, operation_error):

12
moto/managedblockchain/responses.py
View File

@ -4,6 +4,7 @@ import json
from six.moves.urllib.parse import urlparse, parse_qs from six.moves.urllib.parse import urlparse, parse_qs
from moto.core.responses import BaseResponse from moto.core.responses import BaseResponse
from .exceptions import exception_handler
from .models import managedblockchain_backends from .models import managedblockchain_backends
from .utils import ( from .utils import (
region_from_managedblckchain_url, region_from_managedblckchain_url,
@ -21,6 +22,7 @@ class ManagedBlockchainResponse(BaseResponse):
self.backend = backend self.backend = backend
@classmethod @classmethod
@exception_handler
def network_response(clazz, request, full_url, headers): def network_response(clazz, request, full_url, headers):
region_name = region_from_managedblckchain_url(full_url) region_name = region_from_managedblckchain_url(full_url)
response_instance = ManagedBlockchainResponse( response_instance = ManagedBlockchainResponse(
@ -73,6 +75,7 @@ class ManagedBlockchainResponse(BaseResponse):
return 200, headers, json.dumps(response) return 200, headers, json.dumps(response)
@classmethod @classmethod
@exception_handler
def networkid_response(clazz, request, full_url, headers): def networkid_response(clazz, request, full_url, headers):
region_name = region_from_managedblckchain_url(full_url) region_name = region_from_managedblckchain_url(full_url)
response_instance = ManagedBlockchainResponse( response_instance = ManagedBlockchainResponse(
@ -94,6 +97,7 @@ class ManagedBlockchainResponse(BaseResponse):
return 200, headers, response return 200, headers, response
@classmethod @classmethod
@exception_handler
def proposal_response(clazz, request, full_url, headers): def proposal_response(clazz, request, full_url, headers):
region_name = region_from_managedblckchain_url(full_url) region_name = region_from_managedblckchain_url(full_url)
response_instance = ManagedBlockchainResponse( response_instance = ManagedBlockchainResponse(
@ -139,6 +143,7 @@ class ManagedBlockchainResponse(BaseResponse):
return 200, headers, json.dumps(response) return 200, headers, json.dumps(response)
@classmethod @classmethod
@exception_handler
def proposalid_response(clazz, request, full_url, headers): def proposalid_response(clazz, request, full_url, headers):
region_name = region_from_managedblckchain_url(full_url) region_name = region_from_managedblckchain_url(full_url)
response_instance = ManagedBlockchainResponse( response_instance = ManagedBlockchainResponse(
@ -160,6 +165,7 @@ class ManagedBlockchainResponse(BaseResponse):
return 200, headers, response return 200, headers, response
@classmethod @classmethod
@exception_handler
def proposal_votes_response(clazz, request, full_url, headers): def proposal_votes_response(clazz, request, full_url, headers):
region_name = region_from_managedblckchain_url(full_url) region_name = region_from_managedblckchain_url(full_url)
response_instance = ManagedBlockchainResponse( response_instance = ManagedBlockchainResponse(
@ -203,6 +209,7 @@ class ManagedBlockchainResponse(BaseResponse):
return 200, headers, "" return 200, headers, ""
@classmethod @classmethod
@exception_handler
def invitation_response(clazz, request, full_url, headers): def invitation_response(clazz, request, full_url, headers):
region_name = region_from_managedblckchain_url(full_url) region_name = region_from_managedblckchain_url(full_url)
response_instance = ManagedBlockchainResponse( response_instance = ManagedBlockchainResponse(
@ -224,6 +231,7 @@ class ManagedBlockchainResponse(BaseResponse):
return 200, headers, response return 200, headers, response
@classmethod @classmethod
@exception_handler
def invitationid_response(clazz, request, full_url, headers): def invitationid_response(clazz, request, full_url, headers):
region_name = region_from_managedblckchain_url(full_url) region_name = region_from_managedblckchain_url(full_url)
response_instance = ManagedBlockchainResponse( response_instance = ManagedBlockchainResponse(
@ -243,6 +251,7 @@ class ManagedBlockchainResponse(BaseResponse):
return 200, headers, "" return 200, headers, ""
@classmethod @classmethod
@exception_handler
def member_response(clazz, request, full_url, headers): def member_response(clazz, request, full_url, headers):
region_name = region_from_managedblckchain_url(full_url) region_name = region_from_managedblckchain_url(full_url)
response_instance = ManagedBlockchainResponse( response_instance = ManagedBlockchainResponse(
@ -283,6 +292,7 @@ class ManagedBlockchainResponse(BaseResponse):
return 200, headers, json.dumps(response) return 200, headers, json.dumps(response)
@classmethod @classmethod
@exception_handler
def memberid_response(clazz, request, full_url, headers): def memberid_response(clazz, request, full_url, headers):
region_name = region_from_managedblckchain_url(full_url) region_name = region_from_managedblckchain_url(full_url)
response_instance = ManagedBlockchainResponse( response_instance = ManagedBlockchainResponse(
@ -327,6 +337,7 @@ class ManagedBlockchainResponse(BaseResponse):
return 200, headers, "" return 200, headers, ""
@classmethod @classmethod
@exception_handler
def node_response(clazz, request, full_url, headers): def node_response(clazz, request, full_url, headers):
region_name = region_from_managedblckchain_url(full_url) region_name = region_from_managedblckchain_url(full_url)
response_instance = ManagedBlockchainResponse( response_instance = ManagedBlockchainResponse(
@ -380,6 +391,7 @@ class ManagedBlockchainResponse(BaseResponse):
return 200, headers, json.dumps(response) return 200, headers, json.dumps(response)
@classmethod @classmethod
@exception_handler
def nodeid_response(clazz, request, full_url, headers): def nodeid_response(clazz, request, full_url, headers):
region_name = region_from_managedblckchain_url(full_url) region_name = region_from_managedblckchain_url(full_url)
response_instance = ManagedBlockchainResponse( response_instance = ManagedBlockchainResponse(

2
requirements-dev.txt
View File

@ -7,7 +7,7 @@ coverage==4.5.4
flake8==3.7.8 flake8==3.7.8
boto>=2.45.0 boto>=2.45.0
prompt-toolkit==2.0.10 # 3.x is not available with python2 prompt-toolkit==2.0.10 # 3.x is not available with python2
click==6.7 click
inflection==0.3.1 inflection==0.3.1
lxml lxml
packaging packaging

5
setup.py
View File

@ -36,8 +36,7 @@ install_requires = [
"requests>=2.5", "requests>=2.5",
"xmltodict", "xmltodict",
"six>1.9", "six>1.9",
# TODO: werkzeug 2.x currently breaks test_s3_server_post_without_content_length "werkzeug",
"werkzeug<2.0.0",
"pytz", "pytz",
"python-dateutil<3.0.0,>=2.1", "python-dateutil<3.0.0,>=2.1",
"responses>=0.9.0", "responses>=0.9.0",
@ -99,7 +98,7 @@ all_extra_deps = [
_dep_sshpubkeys_py2, _dep_sshpubkeys_py2,
_dep_sshpubkeys_py3, _dep_sshpubkeys_py3,
] ]
all_server_deps = all_extra_deps + ["flask<2.0.0", "flask-cors"] all_server_deps = all_extra_deps + ["flask", "flask-cors"]
# TODO: do we want to add ALL services here? # TODO: do we want to add ALL services here?
# i.e. even those without extra dependencies. # i.e. even those without extra dependencies.

12
tests/test_managedblockchain/test_managedblockchain_invitations.py
View File

@ -1,8 +1,10 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import boto3 import boto3
import pytest
import sure # noqa import sure # noqa
from botocore.exceptions import ClientError
from moto import mock_managedblockchain from moto import mock_managedblockchain
from . import helpers from . import helpers
@ -136,6 +138,10 @@ def test_reject_invitation_badinvitation():
Vote="YES", Vote="YES",
) )
response = conn.reject_invitation.when.called_with( with pytest.raises(ClientError) as ex:
InvitationId="in-ABCDEFGHIJKLMNOP0123456789", conn.reject_invitation(InvitationId="in-ABCDEFGHIJKLMNOP0123456789")
).should.throw(Exception, "InvitationId in-ABCDEFGHIJKLMNOP0123456789 not found.") err = ex.value.response["Error"]
err["Code"].should.equal("ResourceNotFoundException")
err["Message"].should.contain(
"InvitationId in-ABCDEFGHIJKLMNOP0123456789 not found."
)

261
tests/test_managedblockchain/test_managedblockchain_members.py
View File

@ -1,8 +1,10 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import boto3 import boto3
import pytest
import sure # noqa import sure # noqa
from botocore.exceptions import ClientError, ParamValidationError
from moto import mock_managedblockchain from moto import mock_managedblockchain
from . import helpers from . import helpers
@ -165,13 +167,17 @@ def test_create_another_member_withopts():
response["Member"]["Description"].should.equal("Test Member 2") response["Member"]["Description"].should.equal("Test Member 2")
# Try to create member with already used invitation # Try to create member with already used invitation
response = conn.create_member.when.called_with( with pytest.raises(ClientError) as ex:
InvitationId=invitation_id, conn.create_member(
NetworkId=network_id, InvitationId=invitation_id,
MemberConfiguration=helpers.create_member_configuration( NetworkId=network_id,
"testmember2", "admin", "Admin12345", False, "Test Member 2 Duplicate" MemberConfiguration=helpers.create_member_configuration(
), "testmember2", "admin", "Admin12345", False, "Test Member 2 Duplicate"
).should.throw(Exception, "Invitation {0} not valid".format(invitation_id)) ),
)
err = ex.value.response["Error"]
err["Code"].should.equal("InvalidRequestException")
err["Message"].should.contain("Invitation {0} not valid".format(invitation_id))
# Delete member 2 # Delete member 2
conn.delete_member(NetworkId=network_id, MemberId=member_id2) conn.delete_member(NetworkId=network_id, MemberId=member_id2)
@ -182,9 +188,11 @@ def test_create_another_member_withopts():
members.should.have.length_of(2) members.should.have.length_of(2)
# But cannot get # But cannot get
response = conn.get_member.when.called_with( with pytest.raises(ClientError) as ex:
NetworkId=network_id, MemberId=member_id2, conn.get_member(NetworkId=network_id, MemberId=member_id2)
).should.throw(Exception, "Member {0} not found".format(member_id2)) err = ex.value.response["Error"]
err["Code"].should.equal("ResourceNotFoundException")
err["Message"].should.contain("Member {0} not found".format(member_id2))
# Delete member 1 # Delete member 1
conn.delete_member(NetworkId=network_id, MemberId=member_id) conn.delete_member(NetworkId=network_id, MemberId=member_id)
@ -362,13 +370,17 @@ def test_create_too_many_members():
)[0] )[0]
# Try to create one too many members # Try to create one too many members
response = conn.create_member.when.called_with( with pytest.raises(ClientError) as ex:
InvitationId=invitation_id, conn.create_member(
NetworkId=network_id, InvitationId=invitation_id,
MemberConfiguration=helpers.create_member_configuration( NetworkId=network_id,
"testmember6", "admin", "Admin12345", False, "Test Member 6" MemberConfiguration=helpers.create_member_configuration(
), "testmember6", "admin", "Admin12345", False, "Test Member 6"
).should.throw(Exception, "is the maximum number of members allowed in a",) ),
)
err = ex.value.response["Error"]
err["Code"].should.equal("ResourceLimitExceededException")
err["Message"].should.contain("is the maximum number of members allowed in a")
@mock_managedblockchain @mock_managedblockchain
@ -409,17 +421,20 @@ def test_create_another_member_alreadyhave():
invitation_id = response["Invitations"][0]["InvitationId"] invitation_id = response["Invitations"][0]["InvitationId"]
# Should fail trying to create with same name # Should fail trying to create with same name
response = conn.create_member.when.called_with( with pytest.raises(ClientError) as ex:
NetworkId=network_id, conn.create_member(
InvitationId=invitation_id, NetworkId=network_id,
MemberConfiguration=helpers.create_member_configuration( InvitationId=invitation_id,
"testmember1", "admin", "Admin12345", False MemberConfiguration=helpers.create_member_configuration(
), "testmember1", "admin", "Admin12345", False
).should.throw( ),
Exception, )
err = ex.value.response["Error"]
err["Code"].should.equal("InvalidRequestException")
err["Message"].should.contain(
"Member name {0} already exists in network {1}".format( "Member name {0} already exists in network {1}".format(
"testmember1", network_id "testmember1", network_id
), )
) )
@ -427,13 +442,17 @@ def test_create_another_member_alreadyhave():
def test_create_another_member_badnetwork(): def test_create_another_member_badnetwork():
conn = boto3.client("managedblockchain", region_name="us-east-1") conn = boto3.client("managedblockchain", region_name="us-east-1")
response = conn.create_member.when.called_with( with pytest.raises(ClientError) as ex:
NetworkId="n-ABCDEFGHIJKLMNOP0123456789", conn.create_member(
InvitationId="id-ABCDEFGHIJKLMNOP0123456789", NetworkId="n-ABCDEFGHIJKLMNOP0123456789",
MemberConfiguration=helpers.create_member_configuration( InvitationId="id-ABCDEFGHIJKLMNOP0123456789",
"testmember2", "admin", "Admin12345", False MemberConfiguration=helpers.create_member_configuration(
), "testmember2", "admin", "Admin12345", False
).should.throw(Exception, "Network n-ABCDEFGHIJKLMNOP0123456789 not found") ),
)
err = ex.value.response["Error"]
err["Code"].should.equal("ResourceNotFoundException")
err["Message"].should.contain("Network n-ABCDEFGHIJKLMNOP0123456789 not found")
@mock_managedblockchain @mock_managedblockchain
@ -451,13 +470,17 @@ def test_create_another_member_badinvitation():
) )
network_id = response["NetworkId"] network_id = response["NetworkId"]
response = conn.create_member.when.called_with( with pytest.raises(ClientError) as ex:
NetworkId=network_id, conn.create_member(
InvitationId="in-ABCDEFGHIJKLMNOP0123456789", NetworkId=network_id,
MemberConfiguration=helpers.create_member_configuration( InvitationId="in-ABCDEFGHIJKLMNOP0123456789",
"testmember2", "admin", "Admin12345", False MemberConfiguration=helpers.create_member_configuration(
), "testmember2", "admin", "Admin12345", False
).should.throw(Exception, "Invitation in-ABCDEFGHIJKLMNOP0123456789 not valid") ),
)
err = ex.value.response["Error"]
err["Code"].should.equal("InvalidRequestException")
err["Message"].should.contain("Invitation in-ABCDEFGHIJKLMNOP0123456789 not valid")
@mock_managedblockchain @mock_managedblockchain
@ -509,73 +532,97 @@ def test_create_another_member_adminpassword():
badadminpassmemberconf["FrameworkConfiguration"]["Fabric"][ badadminpassmemberconf["FrameworkConfiguration"]["Fabric"][
"AdminPassword" "AdminPassword"
] = "badap" ] = "badap"
response = conn.create_member.when.called_with( with pytest.raises(ParamValidationError) as ex:
NetworkId=network_id, conn.create_member(
InvitationId=invitation_id, NetworkId=network_id,
MemberConfiguration=badadminpassmemberconf, InvitationId=invitation_id,
).should.throw( MemberConfiguration=badadminpassmemberconf,
Exception, )
"Invalid length for parameter MemberConfiguration.FrameworkConfiguration.Fabric.AdminPassword", err = ex.value
str(err).should.contain(
"Invalid length for parameter MemberConfiguration.FrameworkConfiguration.Fabric.AdminPassword"
) )
# No uppercase or numbers # No uppercase or numbers
badadminpassmemberconf["FrameworkConfiguration"]["Fabric"][ badadminpassmemberconf["FrameworkConfiguration"]["Fabric"][
"AdminPassword" "AdminPassword"
] = "badadminpwd" ] = "badadminpwd"
response = conn.create_member.when.called_with( with pytest.raises(ClientError) as ex:
NetworkId=network_id, conn.create_member(
InvitationId=invitation_id, NetworkId=network_id,
MemberConfiguration=badadminpassmemberconf, InvitationId=invitation_id,
).should.throw(Exception, "Invalid request body") MemberConfiguration=badadminpassmemberconf,
)
err = ex.value.response["Error"]
err["Code"].should.equal("BadRequestException")
err["Message"].should.contain("Invalid request body")
# No lowercase or numbers # No lowercase or numbers
badadminpassmemberconf["FrameworkConfiguration"]["Fabric"][ badadminpassmemberconf["FrameworkConfiguration"]["Fabric"][
"AdminPassword" "AdminPassword"
] = "BADADMINPWD" ] = "BADADMINPWD"
response = conn.create_member.when.called_with( with pytest.raises(ClientError) as ex:
NetworkId=network_id, conn.create_member(
InvitationId=invitation_id, NetworkId=network_id,
MemberConfiguration=badadminpassmemberconf, InvitationId=invitation_id,
).should.throw(Exception, "Invalid request body") MemberConfiguration=badadminpassmemberconf,
)
err = ex.value.response["Error"]
err["Code"].should.equal("BadRequestException")
err["Message"].should.contain("Invalid request body")
# No numbers # No numbers
badadminpassmemberconf["FrameworkConfiguration"]["Fabric"][ badadminpassmemberconf["FrameworkConfiguration"]["Fabric"][
"AdminPassword" "AdminPassword"
] = "badAdminpwd" ] = "badAdminpwd"
response = conn.create_member.when.called_with( with pytest.raises(ClientError) as ex:
NetworkId=network_id, conn.create_member(
InvitationId=invitation_id, NetworkId=network_id,
MemberConfiguration=badadminpassmemberconf, InvitationId=invitation_id,
).should.throw(Exception, "Invalid request body") MemberConfiguration=badadminpassmemberconf,
)
err = ex.value.response["Error"]
err["Code"].should.equal("BadRequestException")
err["Message"].should.contain("Invalid request body")
# Invalid character # Invalid character
badadminpassmemberconf["FrameworkConfiguration"]["Fabric"][ badadminpassmemberconf["FrameworkConfiguration"]["Fabric"][
"AdminPassword" "AdminPassword"
] = "badAdmin@pwd1" ] = "badAdmin@pwd1"
response = conn.create_member.when.called_with( with pytest.raises(ClientError) as ex:
NetworkId=network_id, conn.create_member(
InvitationId=invitation_id, NetworkId=network_id,
MemberConfiguration=badadminpassmemberconf, InvitationId=invitation_id,
).should.throw(Exception, "Invalid request body") MemberConfiguration=badadminpassmemberconf,
)
err = ex.value.response["Error"]
err["Code"].should.equal("BadRequestException")
err["Message"].should.contain("Invalid request body")
@mock_managedblockchain @mock_managedblockchain
def test_list_members_badnetwork(): def test_list_members_badnetwork():
conn = boto3.client("managedblockchain", region_name="us-east-1") conn = boto3.client("managedblockchain", region_name="us-east-1")
response = conn.list_members.when.called_with( with pytest.raises(ClientError) as ex:
NetworkId="n-ABCDEFGHIJKLMNOP0123456789", conn.list_members(NetworkId="n-ABCDEFGHIJKLMNOP0123456789")
).should.throw(Exception, "Network n-ABCDEFGHIJKLMNOP0123456789 not found") err = ex.value.response["Error"]
err["Code"].should.equal("ResourceNotFoundException")
err["Message"].should.contain("Network n-ABCDEFGHIJKLMNOP0123456789 not found")
@mock_managedblockchain @mock_managedblockchain
def test_get_member_badnetwork(): def test_get_member_badnetwork():
conn = boto3.client("managedblockchain", region_name="us-east-1") conn = boto3.client("managedblockchain", region_name="us-east-1")
response = conn.get_member.when.called_with( with pytest.raises(ClientError) as ex:
NetworkId="n-ABCDEFGHIJKLMNOP0123456789", conn.get_member(
MemberId="m-ABCDEFGHIJKLMNOP0123456789", NetworkId="n-ABCDEFGHIJKLMNOP0123456789",
).should.throw(Exception, "Network n-ABCDEFGHIJKLMNOP0123456789 not found") MemberId="m-ABCDEFGHIJKLMNOP0123456789",
)
err = ex.value.response["Error"]
err["Code"].should.equal("ResourceNotFoundException")
err["Message"].should.contain("Network n-ABCDEFGHIJKLMNOP0123456789 not found")
@mock_managedblockchain @mock_managedblockchain
@ -593,19 +640,25 @@ def test_get_member_badmember():
) )
network_id = response["NetworkId"] network_id = response["NetworkId"]
response = conn.get_member.when.called_with( with pytest.raises(ClientError) as ex:
NetworkId=network_id, MemberId="m-ABCDEFGHIJKLMNOP0123456789", conn.get_member(NetworkId=network_id, MemberId="m-ABCDEFGHIJKLMNOP0123456789")
).should.throw(Exception, "Member m-ABCDEFGHIJKLMNOP0123456789 not found") err = ex.value.response["Error"]
err["Code"].should.equal("ResourceNotFoundException")
err["Message"].should.contain("Member m-ABCDEFGHIJKLMNOP0123456789 not found")
@mock_managedblockchain @mock_managedblockchain
def test_delete_member_badnetwork(): def test_delete_member_badnetwork():
conn = boto3.client("managedblockchain", region_name="us-east-1") conn = boto3.client("managedblockchain", region_name="us-east-1")
response = conn.delete_member.when.called_with( with pytest.raises(ClientError) as ex:
NetworkId="n-ABCDEFGHIJKLMNOP0123456789", conn.delete_member(
MemberId="m-ABCDEFGHIJKLMNOP0123456789", NetworkId="n-ABCDEFGHIJKLMNOP0123456789",
).should.throw(Exception, "Network n-ABCDEFGHIJKLMNOP0123456789 not found") MemberId="m-ABCDEFGHIJKLMNOP0123456789",
)
err = ex.value.response["Error"]
err["Code"].should.equal("ResourceNotFoundException")
err["Message"].should.contain("Network n-ABCDEFGHIJKLMNOP0123456789 not found")
@mock_managedblockchain @mock_managedblockchain
@ -623,22 +676,30 @@ def test_delete_member_badmember():
) )
network_id = response["NetworkId"] network_id = response["NetworkId"]
response = conn.delete_member.when.called_with( with pytest.raises(ClientError) as ex:
NetworkId=network_id, MemberId="m-ABCDEFGHIJKLMNOP0123456789", conn.delete_member(
).should.throw(Exception, "Member m-ABCDEFGHIJKLMNOP0123456789 not found") NetworkId=network_id, MemberId="m-ABCDEFGHIJKLMNOP0123456789"
)
err = ex.value.response["Error"]
err["Code"].should.equal("ResourceNotFoundException")
err["Message"].should.contain("Member m-ABCDEFGHIJKLMNOP0123456789 not found")
@mock_managedblockchain @mock_managedblockchain
def test_update_member_badnetwork(): def test_update_member_badnetwork():
conn = boto3.client("managedblockchain", region_name="us-east-1") conn = boto3.client("managedblockchain", region_name="us-east-1")
response = conn.update_member.when.called_with( with pytest.raises(ClientError) as ex:
NetworkId="n-ABCDEFGHIJKLMNOP0123456789", conn.update_member(
MemberId="m-ABCDEFGHIJKLMNOP0123456789", NetworkId="n-ABCDEFGHIJKLMNOP0123456789",
LogPublishingConfiguration=helpers.default_memberconfiguration[ MemberId="m-ABCDEFGHIJKLMNOP0123456789",
"LogPublishingConfiguration" LogPublishingConfiguration=helpers.default_memberconfiguration[
], "LogPublishingConfiguration"
).should.throw(Exception, "Network n-ABCDEFGHIJKLMNOP0123456789 not found") ],
)
err = ex.value.response["Error"]
err["Code"].should.equal("ResourceNotFoundException")
err["Message"].should.contain("Network n-ABCDEFGHIJKLMNOP0123456789 not found")
@mock_managedblockchain @mock_managedblockchain
@ -656,10 +717,14 @@ def test_update_member_badmember():
) )
network_id = response["NetworkId"] network_id = response["NetworkId"]
response = conn.update_member.when.called_with( with pytest.raises(ClientError) as ex:
NetworkId=network_id, conn.update_member(
MemberId="m-ABCDEFGHIJKLMNOP0123456789", NetworkId=network_id,
LogPublishingConfiguration=helpers.default_memberconfiguration[ MemberId="m-ABCDEFGHIJKLMNOP0123456789",
"LogPublishingConfiguration" LogPublishingConfiguration=helpers.default_memberconfiguration[
], "LogPublishingConfiguration"
).should.throw(Exception, "Member m-ABCDEFGHIJKLMNOP0123456789 not found") ],
)
err = ex.value.response["Error"]
err["Code"].should.equal("ResourceNotFoundException")
err["Message"].should.contain("Member m-ABCDEFGHIJKLMNOP0123456789 not found")

78
tests/test_managedblockchain/test_managedblockchain_networks.py
View File

@ -1,8 +1,10 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import boto3 import boto3
import pytest
import sure # noqa import sure # noqa
from botocore.exceptions import ClientError
from moto import mock_managedblockchain from moto import mock_managedblockchain
from . import helpers from . import helpers
@ -68,31 +70,39 @@ def test_create_network_withopts():
def test_create_network_noframework(): def test_create_network_noframework():
conn = boto3.client("managedblockchain", region_name="us-east-1") conn = boto3.client("managedblockchain", region_name="us-east-1")
response = conn.create_network.when.called_with( with pytest.raises(ClientError) as ex:
Name="testnetwork1", conn.create_network(
Description="Test Network 1", Name="testnetwork1",
Framework="HYPERLEDGER_VINYL", Description="Test Network 1",
FrameworkVersion="1.2", Framework="HYPERLEDGER_VINYL",
FrameworkConfiguration=helpers.default_frameworkconfiguration, FrameworkVersion="1.2",
VotingPolicy=helpers.default_votingpolicy, FrameworkConfiguration=helpers.default_frameworkconfiguration,
MemberConfiguration=helpers.default_memberconfiguration, VotingPolicy=helpers.default_votingpolicy,
).should.throw(Exception, "Invalid request body") MemberConfiguration=helpers.default_memberconfiguration,
)
err = ex.value.response["Error"]
err["Code"].should.equal("BadRequestException")
err["Message"].should.contain("Invalid request body")
@mock_managedblockchain @mock_managedblockchain
def test_create_network_badframeworkver(): def test_create_network_badframeworkver():
conn = boto3.client("managedblockchain", region_name="us-east-1") conn = boto3.client("managedblockchain", region_name="us-east-1")
response = conn.create_network.when.called_with( with pytest.raises(ClientError) as ex:
Name="testnetwork1", conn.create_network(
Description="Test Network 1", Name="testnetwork1",
Framework="HYPERLEDGER_FABRIC", Description="Test Network 1",
FrameworkVersion="1.X", Framework="HYPERLEDGER_FABRIC",
FrameworkConfiguration=helpers.default_frameworkconfiguration, FrameworkVersion="1.X",
VotingPolicy=helpers.default_votingpolicy, FrameworkConfiguration=helpers.default_frameworkconfiguration,
MemberConfiguration=helpers.default_memberconfiguration, VotingPolicy=helpers.default_votingpolicy,
).should.throw( MemberConfiguration=helpers.default_memberconfiguration,
Exception, "Invalid version 1.X requested for framework HYPERLEDGER_FABRIC" )
err = ex.value.response["Error"]
err["Code"].should.equal("BadRequestException")
err["Message"].should.contain(
"Invalid version 1.X requested for framework HYPERLEDGER_FABRIC"
) )
@ -102,21 +112,27 @@ def test_create_network_badedition():
frameworkconfiguration = {"Fabric": {"Edition": "SUPER"}} frameworkconfiguration = {"Fabric": {"Edition": "SUPER"}}
response = conn.create_network.when.called_with( with pytest.raises(ClientError) as ex:
Name="testnetwork1", conn.create_network(
Description="Test Network 1", Name="testnetwork1",
Framework="HYPERLEDGER_FABRIC", Description="Test Network 1",
FrameworkVersion="1.2", Framework="HYPERLEDGER_FABRIC",
FrameworkConfiguration=frameworkconfiguration, FrameworkVersion="1.2",
VotingPolicy=helpers.default_votingpolicy, FrameworkConfiguration=frameworkconfiguration,
MemberConfiguration=helpers.default_memberconfiguration, VotingPolicy=helpers.default_votingpolicy,
).should.throw(Exception, "Invalid request body") MemberConfiguration=helpers.default_memberconfiguration,
)
err = ex.value.response["Error"]
err["Code"].should.equal("BadRequestException")
err["Message"].should.contain("Invalid request body")
@mock_managedblockchain @mock_managedblockchain
def test_get_network_badnetwork(): def test_get_network_badnetwork():
conn = boto3.client("managedblockchain", region_name="us-east-1") conn = boto3.client("managedblockchain", region_name="us-east-1")
response = conn.get_network.when.called_with( with pytest.raises(ClientError) as ex:
NetworkId="n-ABCDEFGHIJKLMNOP0123456789", conn.get_network(NetworkId="n-ABCDEFGHIJKLMNOP0123456789")
).should.throw(Exception, "Network n-ABCDEFGHIJKLMNOP0123456789 not found") err = ex.value.response["Error"]
err["Code"].should.equal("ResourceNotFoundException")
err["Message"].should.contain("Network n-ABCDEFGHIJKLMNOP0123456789 not found")

261
tests/test_managedblockchain/test_managedblockchain_nodes.py
View File

@ -1,8 +1,10 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import boto3 import boto3
import pytest
import sure # noqa import sure # noqa
from botocore.exceptions import ClientError
from moto import mock_managedblockchain from moto import mock_managedblockchain
from . import helpers from . import helpers
@ -76,9 +78,11 @@ def test_create_node():
helpers.node_id_exist_in_list(nodes, node_id).should.equal(True) helpers.node_id_exist_in_list(nodes, node_id).should.equal(True)
# But cannot get # But cannot get
response = conn.get_node.when.called_with( with pytest.raises(ClientError) as ex:
NetworkId=network_id, MemberId=member_id, NodeId=node_id, conn.get_node(NetworkId=network_id, MemberId=member_id, NodeId=node_id)
).should.throw(Exception, "Node {0} not found".format(node_id)) err = ex.value.response["Error"]
err["Code"].should.equal("ResourceNotFoundException")
err["Message"].should.contain("Node {0} not found".format(node_id))
@mock_managedblockchain @mock_managedblockchain
@ -145,9 +149,11 @@ def test_create_node_standard_edition():
conn.delete_member(NetworkId=network_id, MemberId=member_id) conn.delete_member(NetworkId=network_id, MemberId=member_id)
# Should now be an exception # Should now be an exception
response = conn.list_nodes.when.called_with( with pytest.raises(ClientError) as ex:
NetworkId=network_id, MemberId=member_id, conn.list_nodes(NetworkId=network_id, MemberId=member_id)
).should.throw(Exception, "Member {0} not found".format(member_id)) err = ex.value.response["Error"]
err["Code"].should.equal("ResourceNotFoundException")
err["Message"].should.contain("Member {0} not found".format(member_id))
@mock_managedblockchain @mock_managedblockchain
@ -187,12 +193,16 @@ def test_create_too_many_nodes():
nodes.should.have.length_of(2) nodes.should.have.length_of(2)
# Try to create one too many nodes # Try to create one too many nodes
response = conn.create_node.when.called_with( with pytest.raises(ClientError) as ex:
NetworkId=network_id, conn.create_node(
MemberId=member_id, NetworkId=network_id,
NodeConfiguration=helpers.default_nodeconfiguration, MemberId=member_id,
).should.throw( NodeConfiguration=helpers.default_nodeconfiguration,
Exception, "Maximum number of nodes exceeded in member {0}".format(member_id), )
err = ex.value.response["Error"]
err["Code"].should.equal("ResourceLimitExceededException")
err["Message"].should.contain(
"Maximum number of nodes exceeded in member {0}".format(member_id)
) )
@ -200,11 +210,15 @@ def test_create_too_many_nodes():
def test_create_node_badnetwork(): def test_create_node_badnetwork():
conn = boto3.client("managedblockchain", region_name="us-east-1") conn = boto3.client("managedblockchain", region_name="us-east-1")
response = conn.create_node.when.called_with( with pytest.raises(ClientError) as ex:
NetworkId="n-ABCDEFGHIJKLMNOP0123456789", conn.create_node(
MemberId="m-ABCDEFGHIJKLMNOP0123456789", NetworkId="n-ABCDEFGHIJKLMNOP0123456789",
NodeConfiguration=helpers.default_nodeconfiguration, MemberId="m-ABCDEFGHIJKLMNOP0123456789",
).should.throw(Exception, "Network n-ABCDEFGHIJKLMNOP0123456789 not found") NodeConfiguration=helpers.default_nodeconfiguration,
)
err = ex.value.response["Error"]
err["Code"].should.equal("ResourceNotFoundException")
err["Message"].should.contain("Network n-ABCDEFGHIJKLMNOP0123456789 not found")
@mock_managedblockchain @mock_managedblockchain
@ -222,11 +236,15 @@ def test_create_node_badmember():
) )
network_id = response["NetworkId"] network_id = response["NetworkId"]
response = conn.create_node.when.called_with( with pytest.raises(ClientError) as ex:
NetworkId=network_id, conn.create_node(
MemberId="m-ABCDEFGHIJKLMNOP0123456789", NetworkId=network_id,
NodeConfiguration=helpers.default_nodeconfiguration, MemberId="m-ABCDEFGHIJKLMNOP0123456789",
).should.throw(Exception, "Member m-ABCDEFGHIJKLMNOP0123456789 not found") NodeConfiguration=helpers.default_nodeconfiguration,
)
err = ex.value.response["Error"]
err["Code"].should.equal("ResourceNotFoundException")
err["Message"].should.contain("Member m-ABCDEFGHIJKLMNOP0123456789 not found")
@mock_managedblockchain @mock_managedblockchain
@ -248,36 +266,51 @@ def test_create_node_badnodeconfig():
# Incorrect instance type # Incorrect instance type
logconfigbad = dict(helpers.default_nodeconfiguration) logconfigbad = dict(helpers.default_nodeconfiguration)
logconfigbad["InstanceType"] = "foo" logconfigbad["InstanceType"] = "foo"
response = conn.create_node.when.called_with( with pytest.raises(ClientError) as ex:
NetworkId=network_id, MemberId=member_id, NodeConfiguration=logconfigbad, conn.create_node(
).should.throw(Exception, "Requested instance foo isn't supported.") NetworkId=network_id, MemberId=member_id, NodeConfiguration=logconfigbad
)
err = ex.value.response["Error"]
err["Code"].should.equal("InvalidRequestException")
err["Message"].should.contain("Requested instance foo isn't supported.")
# Incorrect instance type for edition # Incorrect instance type for edition
logconfigbad = dict(helpers.default_nodeconfiguration) logconfigbad = dict(helpers.default_nodeconfiguration)
logconfigbad["InstanceType"] = "bc.t3.large" logconfigbad["InstanceType"] = "bc.t3.large"
response = conn.create_node.when.called_with( with pytest.raises(ClientError) as ex:
NetworkId=network_id, MemberId=member_id, NodeConfiguration=logconfigbad, conn.create_node(
).should.throw( NetworkId=network_id, MemberId=member_id, NodeConfiguration=logconfigbad
Exception, )
"Instance type bc.t3.large is not supported with STARTER Edition networks", err = ex.value.response["Error"]
err["Code"].should.equal("InvalidRequestException")
err["Message"].should.contain(
"Instance type bc.t3.large is not supported with STARTER Edition networks."
) )
# Incorrect availability zone # Incorrect availability zone
logconfigbad = dict(helpers.default_nodeconfiguration) logconfigbad = dict(helpers.default_nodeconfiguration)
logconfigbad["AvailabilityZone"] = "us-east-11" logconfigbad["AvailabilityZone"] = "us-east-11"
response = conn.create_node.when.called_with( with pytest.raises(ClientError) as ex:
NetworkId=network_id, MemberId=member_id, NodeConfiguration=logconfigbad, conn.create_node(
).should.throw(Exception, "Availability Zone is not valid") NetworkId=network_id, MemberId=member_id, NodeConfiguration=logconfigbad
)
err = ex.value.response["Error"]
err["Code"].should.equal("InvalidRequestException")
err["Message"].should.contain("Availability Zone is not valid")
@mock_managedblockchain @mock_managedblockchain
def test_list_nodes_badnetwork(): def test_list_nodes_badnetwork():
conn = boto3.client("managedblockchain", region_name="us-east-1") conn = boto3.client("managedblockchain", region_name="us-east-1")
response = conn.list_nodes.when.called_with( with pytest.raises(ClientError) as ex:
NetworkId="n-ABCDEFGHIJKLMNOP0123456789", conn.list_nodes(
MemberId="m-ABCDEFGHIJKLMNOP0123456789", NetworkId="n-ABCDEFGHIJKLMNOP0123456789",
).should.throw(Exception, "Network n-ABCDEFGHIJKLMNOP0123456789 not found") MemberId="m-ABCDEFGHIJKLMNOP0123456789",
)
err = ex.value.response["Error"]
err["Code"].should.equal("ResourceNotFoundException")
err["Message"].should.contain("Network n-ABCDEFGHIJKLMNOP0123456789 not found")
@mock_managedblockchain @mock_managedblockchain
@ -295,20 +328,28 @@ def test_list_nodes_badmember():
) )
network_id = response["NetworkId"] network_id = response["NetworkId"]
response = conn.list_nodes.when.called_with( with pytest.raises(ClientError) as ex:
NetworkId=network_id, MemberId="m-ABCDEFGHIJKLMNOP0123456789", conn.list_nodes(
).should.throw(Exception, "Member m-ABCDEFGHIJKLMNOP0123456789 not found") NetworkId=network_id, MemberId="m-ABCDEFGHIJKLMNOP0123456789",
)
err = ex.value.response["Error"]
err["Code"].should.equal("ResourceNotFoundException")
err["Message"].should.contain("Member m-ABCDEFGHIJKLMNOP0123456789 not found")
@mock_managedblockchain @mock_managedblockchain
def test_get_node_badnetwork(): def test_get_node_badnetwork():
conn = boto3.client("managedblockchain", region_name="us-east-1") conn = boto3.client("managedblockchain", region_name="us-east-1")
response = conn.get_node.when.called_with( with pytest.raises(ClientError) as ex:
NetworkId="n-ABCDEFGHIJKLMNOP0123456789", conn.get_node(
MemberId="m-ABCDEFGHIJKLMNOP0123456789", NetworkId="n-ABCDEFGHIJKLMNOP0123456789",
NodeId="nd-ABCDEFGHIJKLMNOP0123456789", MemberId="m-ABCDEFGHIJKLMNOP0123456789",
).should.throw(Exception, "Network n-ABCDEFGHIJKLMNOP0123456789 not found") NodeId="nd-ABCDEFGHIJKLMNOP0123456789",
)
err = ex.value.response["Error"]
err["Code"].should.equal("ResourceNotFoundException")
err["Message"].should.contain("Network n-ABCDEFGHIJKLMNOP0123456789 not found")
@mock_managedblockchain @mock_managedblockchain
@ -326,11 +367,15 @@ def test_get_node_badmember():
) )
network_id = response["NetworkId"] network_id = response["NetworkId"]
response = conn.get_node.when.called_with( with pytest.raises(ClientError) as ex:
NetworkId=network_id, conn.get_node(
MemberId="m-ABCDEFGHIJKLMNOP0123456789", NetworkId=network_id,
NodeId="nd-ABCDEFGHIJKLMNOP0123456789", MemberId="m-ABCDEFGHIJKLMNOP0123456789",
).should.throw(Exception, "Member m-ABCDEFGHIJKLMNOP0123456789 not found") NodeId="nd-ABCDEFGHIJKLMNOP0123456789",
)
err = ex.value.response["Error"]
err["Code"].should.equal("ResourceNotFoundException")
err["Message"].should.contain("Member m-ABCDEFGHIJKLMNOP0123456789 not found")
@mock_managedblockchain @mock_managedblockchain
@ -349,22 +394,30 @@ def test_get_node_badnode():
network_id = response["NetworkId"] network_id = response["NetworkId"]
member_id = response["MemberId"] member_id = response["MemberId"]
response = conn.get_node.when.called_with( with pytest.raises(ClientError) as ex:
NetworkId=network_id, conn.get_node(
MemberId=member_id, NetworkId=network_id,
NodeId="nd-ABCDEFGHIJKLMNOP0123456789", MemberId=member_id,
).should.throw(Exception, "Node nd-ABCDEFGHIJKLMNOP0123456789 not found") NodeId="nd-ABCDEFGHIJKLMNOP0123456789",
)
err = ex.value.response["Error"]
err["Code"].should.equal("ResourceNotFoundException")
err["Message"].should.contain("Node nd-ABCDEFGHIJKLMNOP0123456789 not found")
@mock_managedblockchain @mock_managedblockchain
def test_delete_node_badnetwork(): def test_delete_node_badnetwork():
conn = boto3.client("managedblockchain", region_name="us-east-1") conn = boto3.client("managedblockchain", region_name="us-east-1")
response = conn.delete_node.when.called_with( with pytest.raises(ClientError) as ex:
NetworkId="n-ABCDEFGHIJKLMNOP0123456789", conn.delete_node(
MemberId="m-ABCDEFGHIJKLMNOP0123456789", NetworkId="n-ABCDEFGHIJKLMNOP0123456789",
NodeId="nd-ABCDEFGHIJKLMNOP0123456789", MemberId="m-ABCDEFGHIJKLMNOP0123456789",
).should.throw(Exception, "Network n-ABCDEFGHIJKLMNOP0123456789 not found") NodeId="nd-ABCDEFGHIJKLMNOP0123456789",
)
err = ex.value.response["Error"]
err["Code"].should.equal("ResourceNotFoundException")
err["Message"].should.contain("Network n-ABCDEFGHIJKLMNOP0123456789 not found")
@mock_managedblockchain @mock_managedblockchain
@ -382,11 +435,15 @@ def test_delete_node_badmember():
) )
network_id = response["NetworkId"] network_id = response["NetworkId"]
response = conn.delete_node.when.called_with( with pytest.raises(ClientError) as ex:
NetworkId=network_id, conn.delete_node(
MemberId="m-ABCDEFGHIJKLMNOP0123456789", NetworkId=network_id,
NodeId="nd-ABCDEFGHIJKLMNOP0123456789", MemberId="m-ABCDEFGHIJKLMNOP0123456789",
).should.throw(Exception, "Member m-ABCDEFGHIJKLMNOP0123456789 not found") NodeId="nd-ABCDEFGHIJKLMNOP0123456789",
)
err = ex.value.response["Error"]
err["Code"].should.equal("ResourceNotFoundException")
err["Message"].should.contain("Member m-ABCDEFGHIJKLMNOP0123456789 not found")
@mock_managedblockchain @mock_managedblockchain
@ -405,25 +462,33 @@ def test_delete_node_badnode():
network_id = response["NetworkId"] network_id = response["NetworkId"]
member_id = response["MemberId"] member_id = response["MemberId"]
response = conn.delete_node.when.called_with( with pytest.raises(ClientError) as ex:
NetworkId=network_id, conn.delete_node(
MemberId=member_id, NetworkId=network_id,
NodeId="nd-ABCDEFGHIJKLMNOP0123456789", MemberId=member_id,
).should.throw(Exception, "Node nd-ABCDEFGHIJKLMNOP0123456789 not found") NodeId="nd-ABCDEFGHIJKLMNOP0123456789",
)
err = ex.value.response["Error"]
err["Code"].should.equal("ResourceNotFoundException")
err["Message"].should.contain("Node nd-ABCDEFGHIJKLMNOP0123456789 not found")
@mock_managedblockchain @mock_managedblockchain
def test_update_node_badnetwork(): def test_update_node_badnetwork():
conn = boto3.client("managedblockchain", region_name="us-east-1") conn = boto3.client("managedblockchain", region_name="us-east-1")
response = conn.update_node.when.called_with( with pytest.raises(ClientError) as ex:
NetworkId="n-ABCDEFGHIJKLMNOP0123456789", conn.update_node(
MemberId="m-ABCDEFGHIJKLMNOP0123456789", NetworkId="n-ABCDEFGHIJKLMNOP0123456789",
NodeId="nd-ABCDEFGHIJKLMNOP0123456789", MemberId="m-ABCDEFGHIJKLMNOP0123456789",
LogPublishingConfiguration=helpers.default_nodeconfiguration[ NodeId="nd-ABCDEFGHIJKLMNOP0123456789",
"LogPublishingConfiguration" LogPublishingConfiguration=helpers.default_nodeconfiguration[
], "LogPublishingConfiguration"
).should.throw(Exception, "Network n-ABCDEFGHIJKLMNOP0123456789 not found") ],
)
err = ex.value.response["Error"]
err["Code"].should.equal("ResourceNotFoundException")
err["Message"].should.contain("Network n-ABCDEFGHIJKLMNOP0123456789 not found")
@mock_managedblockchain @mock_managedblockchain
@ -441,14 +506,18 @@ def test_update_node_badmember():
) )
network_id = response["NetworkId"] network_id = response["NetworkId"]
response = conn.update_node.when.called_with( with pytest.raises(ClientError) as ex:
NetworkId=network_id, conn.update_node(
MemberId="m-ABCDEFGHIJKLMNOP0123456789", NetworkId=network_id,
NodeId="nd-ABCDEFGHIJKLMNOP0123456789", MemberId="m-ABCDEFGHIJKLMNOP0123456789",
LogPublishingConfiguration=helpers.default_nodeconfiguration[ NodeId="nd-ABCDEFGHIJKLMNOP0123456789",
"LogPublishingConfiguration" LogPublishingConfiguration=helpers.default_nodeconfiguration[
], "LogPublishingConfiguration"
).should.throw(Exception, "Member m-ABCDEFGHIJKLMNOP0123456789 not found") ],
)
err = ex.value.response["Error"]
err["Code"].should.equal("ResourceNotFoundException")
err["Message"].should.contain("Member m-ABCDEFGHIJKLMNOP0123456789 not found")
@mock_managedblockchain @mock_managedblockchain
@ -467,11 +536,15 @@ def test_update_node_badnode():
network_id = response["NetworkId"] network_id = response["NetworkId"]
member_id = response["MemberId"] member_id = response["MemberId"]
response = conn.update_node.when.called_with( with pytest.raises(ClientError) as ex:
NetworkId=network_id, conn.update_node(
MemberId=member_id, NetworkId=network_id,
NodeId="nd-ABCDEFGHIJKLMNOP0123456789", MemberId=member_id,
LogPublishingConfiguration=helpers.default_nodeconfiguration[ NodeId="nd-ABCDEFGHIJKLMNOP0123456789",
"LogPublishingConfiguration" LogPublishingConfiguration=helpers.default_nodeconfiguration[
], "LogPublishingConfiguration"
).should.throw(Exception, "Node nd-ABCDEFGHIJKLMNOP0123456789 not found") ],
)
err = ex.value.response["Error"]
err["Code"].should.equal("ResourceNotFoundException")
err["Message"].should.contain("Node nd-ABCDEFGHIJKLMNOP0123456789 not found")

82
tests/test_managedblockchain/test_managedblockchain_proposals.py
View File

@ -1,8 +1,10 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import boto3 import boto3
import pytest
import sure # noqa import sure # noqa
from botocore.exceptions import ClientError
from moto import mock_managedblockchain from moto import mock_managedblockchain
from . import helpers from . import helpers
@ -82,11 +84,15 @@ def test_create_proposal_withopts():
def test_create_proposal_badnetwork(): def test_create_proposal_badnetwork():
conn = boto3.client("managedblockchain", region_name="us-east-1") conn = boto3.client("managedblockchain", region_name="us-east-1")
response = conn.create_proposal.when.called_with( with pytest.raises(ClientError) as ex:
NetworkId="n-ABCDEFGHIJKLMNOP0123456789", conn.create_proposal(
MemberId="m-ABCDEFGHIJKLMNOP0123456789", NetworkId="n-ABCDEFGHIJKLMNOP0123456789",
Actions=helpers.default_policy_actions, MemberId="m-ABCDEFGHIJKLMNOP0123456789",
).should.throw(Exception, "Network n-ABCDEFGHIJKLMNOP0123456789 not found") Actions=helpers.default_policy_actions,
)
err = ex.value.response["Error"]
err["Code"].should.equal("ResourceNotFoundException")
err["Message"].should.contain("Network n-ABCDEFGHIJKLMNOP0123456789 not found")
@mock_managedblockchain @mock_managedblockchain
@ -104,11 +110,15 @@ def test_create_proposal_badmember():
) )
network_id = response["NetworkId"] network_id = response["NetworkId"]
response = conn.create_proposal.when.called_with( with pytest.raises(ClientError) as ex:
NetworkId=network_id, conn.create_proposal(
MemberId="m-ABCDEFGHIJKLMNOP0123456789", NetworkId=network_id,
Actions=helpers.default_policy_actions, MemberId="m-ABCDEFGHIJKLMNOP0123456789",
).should.throw(Exception, "Member m-ABCDEFGHIJKLMNOP0123456789 not found") Actions=helpers.default_policy_actions,
)
err = ex.value.response["Error"]
err["Code"].should.equal("ResourceNotFoundException")
err["Message"].should.contain("Member m-ABCDEFGHIJKLMNOP0123456789 not found")
@mock_managedblockchain @mock_managedblockchain
@ -130,9 +140,15 @@ def test_create_proposal_badinvitationacctid():
network_id = response["NetworkId"] network_id = response["NetworkId"]
member_id = response["MemberId"] member_id = response["MemberId"]
response = conn.create_proposal.when.called_with( with pytest.raises(ClientError) as ex:
NetworkId=network_id, MemberId=member_id, Actions=actions, conn.create_proposal(
).should.throw(Exception, "Account ID format specified in proposal is not valid") NetworkId=network_id, MemberId=member_id, Actions=actions,
)
err = ex.value.response["Error"]
err["Code"].should.equal("InvalidRequestException")
err["Message"].should.contain(
"Account ID format specified in proposal is not valid"
)
@mock_managedblockchain @mock_managedblockchain
@ -154,28 +170,38 @@ def test_create_proposal_badremovalmemid():
network_id = response["NetworkId"] network_id = response["NetworkId"]
member_id = response["MemberId"] member_id = response["MemberId"]
response = conn.create_proposal.when.called_with( with pytest.raises(ClientError) as ex:
NetworkId=network_id, MemberId=member_id, Actions=actions, conn.create_proposal(
).should.throw(Exception, "Member ID format specified in proposal is not valid") NetworkId=network_id, MemberId=member_id, Actions=actions,
)
err = ex.value.response["Error"]
err["Code"].should.equal("InvalidRequestException")
err["Message"].should.contain("Member ID format specified in proposal is not valid")
@mock_managedblockchain @mock_managedblockchain
def test_list_proposal_badnetwork(): def test_list_proposal_badnetwork():
conn = boto3.client("managedblockchain", region_name="us-east-1") conn = boto3.client("managedblockchain", region_name="us-east-1")
response = conn.list_proposals.when.called_with( with pytest.raises(ClientError) as ex:
NetworkId="n-ABCDEFGHIJKLMNOP0123456789", conn.list_proposals(NetworkId="n-ABCDEFGHIJKLMNOP0123456789",)
).should.throw(Exception, "Network n-ABCDEFGHIJKLMNOP0123456789 not found") err = ex.value.response["Error"]
err["Code"].should.equal("ResourceNotFoundException")
err["Message"].should.contain("Network n-ABCDEFGHIJKLMNOP0123456789 not found")
@mock_managedblockchain @mock_managedblockchain
def test_get_proposal_badnetwork(): def test_get_proposal_badnetwork():
conn = boto3.client("managedblockchain", region_name="us-east-1") conn = boto3.client("managedblockchain", region_name="us-east-1")
response = conn.get_proposal.when.called_with( with pytest.raises(ClientError) as ex:
NetworkId="n-ABCDEFGHIJKLMNOP0123456789", conn.get_proposal(
ProposalId="p-ABCDEFGHIJKLMNOP0123456789", NetworkId="n-ABCDEFGHIJKLMNOP0123456789",
).should.throw(Exception, "Network n-ABCDEFGHIJKLMNOP0123456789 not found") ProposalId="p-ABCDEFGHIJKLMNOP0123456789",
)
err = ex.value.response["Error"]
err["Code"].should.equal("ResourceNotFoundException")
err["Message"].should.contain("Network n-ABCDEFGHIJKLMNOP0123456789 not found")
@mock_managedblockchain @mock_managedblockchain
@ -193,6 +219,10 @@ def test_get_proposal_badproposal():
) )
network_id = response["NetworkId"] network_id = response["NetworkId"]
response = conn.get_proposal.when.called_with( with pytest.raises(ClientError) as ex:
NetworkId=network_id, ProposalId="p-ABCDEFGHIJKLMNOP0123456789", conn.get_proposal(
).should.throw(Exception, "Proposal p-ABCDEFGHIJKLMNOP0123456789 not found") NetworkId=network_id, ProposalId="p-ABCDEFGHIJKLMNOP0123456789",
)
err = ex.value.response["Error"]
err["Code"].should.equal("ResourceNotFoundException")
err["Message"].should.contain("Proposal p-ABCDEFGHIJKLMNOP0123456789 not found")

142
tests/test_managedblockchain/test_managedblockchain_proposalvotes.py
View File

@ -3,7 +3,9 @@ from __future__ import unicode_literals
import os import os
import boto3 import boto3
import pytest
import sure # noqa import sure # noqa
from botocore.exceptions import ClientError
from freezegun import freeze_time from freezegun import freeze_time
from unittest import SkipTest from unittest import SkipTest
@ -321,14 +323,17 @@ def test_vote_on_proposal_expiredproposal():
with freeze_time("2015-02-01 12:00:00"): with freeze_time("2015-02-01 12:00:00"):
# Vote yes - should set status to expired # Vote yes - should set status to expired
response = conn.vote_on_proposal.when.called_with( with pytest.raises(ClientError) as ex:
NetworkId=network_id, conn.vote_on_proposal(
ProposalId=proposal_id, NetworkId=network_id,
VoterMemberId=member_id, ProposalId=proposal_id,
Vote="YES", VoterMemberId=member_id,
).should.throw( Vote="YES",
Exception, )
"Proposal {0} is expired and you cannot vote on it.".format(proposal_id), err = ex.value.response["Error"]
err["Code"].should.equal("InvalidRequestException")
err["Message"].should.contain(
"Proposal {0} is expired and you cannot vote on it.".format(proposal_id)
) )
# Get proposal details - should be EXPIRED # Get proposal details - should be EXPIRED
@ -438,12 +443,16 @@ def test_vote_on_proposal_status_check():
pendinginvs.should.have.length_of(1) pendinginvs.should.have.length_of(1)
# Vote with member 3 - should throw an exception and not create a new invitation # Vote with member 3 - should throw an exception and not create a new invitation
response = conn.vote_on_proposal.when.called_with( with pytest.raises(ClientError) as ex:
NetworkId=network_id, conn.vote_on_proposal(
ProposalId=proposal_id, NetworkId=network_id,
VoterMemberId=memberidlist[2], ProposalId=proposal_id,
Vote="YES", VoterMemberId=memberidlist[2],
).should.throw(Exception, "and you cannot vote on it") Vote="YES",
)
err = ex.value.response["Error"]
err["Code"].should.equal("InvalidRequestException")
err["Message"].should.contain("and you cannot vote on it")
# Should still be one pending invitation # Should still be one pending invitation
response = conn.list_invitations() response = conn.list_invitations()
@ -457,12 +466,16 @@ def test_vote_on_proposal_status_check():
def test_vote_on_proposal_badnetwork(): def test_vote_on_proposal_badnetwork():
conn = boto3.client("managedblockchain", region_name="us-east-1") conn = boto3.client("managedblockchain", region_name="us-east-1")
response = conn.vote_on_proposal.when.called_with( with pytest.raises(ClientError) as ex:
NetworkId="n-ABCDEFGHIJKLMNOP0123456789", conn.vote_on_proposal(
ProposalId="p-ABCDEFGHIJKLMNOP0123456789", NetworkId="n-ABCDEFGHIJKLMNOP0123456789",
VoterMemberId="m-ABCDEFGHIJKLMNOP0123456789", ProposalId="p-ABCDEFGHIJKLMNOP0123456789",
Vote="YES", VoterMemberId="m-ABCDEFGHIJKLMNOP0123456789",
).should.throw(Exception, "Network n-ABCDEFGHIJKLMNOP0123456789 not found") Vote="YES",
)
err = ex.value.response["Error"]
err["Code"].should.equal("ResourceNotFoundException")
err["Message"].should.contain("Network n-ABCDEFGHIJKLMNOP0123456789 not found")
@mock_managedblockchain @mock_managedblockchain
@ -480,12 +493,16 @@ def test_vote_on_proposal_badproposal():
) )
network_id = response["NetworkId"] network_id = response["NetworkId"]
response = conn.vote_on_proposal.when.called_with( with pytest.raises(ClientError) as ex:
NetworkId=network_id, conn.vote_on_proposal(
ProposalId="p-ABCDEFGHIJKLMNOP0123456789", NetworkId=network_id,
VoterMemberId="m-ABCDEFGHIJKLMNOP0123456789", ProposalId="p-ABCDEFGHIJKLMNOP0123456789",
Vote="YES", VoterMemberId="m-ABCDEFGHIJKLMNOP0123456789",
).should.throw(Exception, "Proposal p-ABCDEFGHIJKLMNOP0123456789 not found") Vote="YES",
)
err = ex.value.response["Error"]
err["Code"].should.equal("ResourceNotFoundException")
err["Message"].should.contain("Proposal p-ABCDEFGHIJKLMNOP0123456789 not found")
@mock_managedblockchain @mock_managedblockchain
@ -512,12 +529,16 @@ def test_vote_on_proposal_badmember():
proposal_id = response["ProposalId"] proposal_id = response["ProposalId"]
response = conn.vote_on_proposal.when.called_with( with pytest.raises(ClientError) as ex:
NetworkId=network_id, conn.vote_on_proposal(
ProposalId=proposal_id, NetworkId=network_id,
VoterMemberId="m-ABCDEFGHIJKLMNOP0123456789", ProposalId=proposal_id,
Vote="YES", VoterMemberId="m-ABCDEFGHIJKLMNOP0123456789",
).should.throw(Exception, "Member m-ABCDEFGHIJKLMNOP0123456789 not found") Vote="YES",
)
err = ex.value.response["Error"]
err["Code"].should.equal("ResourceNotFoundException")
err["Message"].should.contain("Member m-ABCDEFGHIJKLMNOP0123456789 not found")
@mock_managedblockchain @mock_managedblockchain
@ -544,12 +565,16 @@ def test_vote_on_proposal_badvote():
proposal_id = response["ProposalId"] proposal_id = response["ProposalId"]
response = conn.vote_on_proposal.when.called_with( with pytest.raises(ClientError) as ex:
NetworkId=network_id, conn.vote_on_proposal(
ProposalId=proposal_id, NetworkId=network_id,
VoterMemberId=member_id, ProposalId=proposal_id,
Vote="FOO", VoterMemberId=member_id,
).should.throw(Exception, "Invalid request body") Vote="FOO",
)
err = ex.value.response["Error"]
err["Code"].should.equal("BadRequestException")
err["Message"].should.contain("Invalid request body")
@mock_managedblockchain @mock_managedblockchain
@ -628,14 +653,17 @@ def test_vote_on_proposal_alreadyvoted():
) )
# Vote yes with member 1 again # Vote yes with member 1 again
response = conn.vote_on_proposal.when.called_with( with pytest.raises(ClientError) as ex:
NetworkId=network_id, conn.vote_on_proposal(
ProposalId=proposal_id, NetworkId=network_id,
VoterMemberId=member_id, ProposalId=proposal_id,
Vote="YES", VoterMemberId=member_id,
).should.throw( Vote="YES",
Exception, )
"Member {0} has already voted on proposal {1}.".format(member_id, proposal_id), err = ex.value.response["Error"]
err["Code"].should.equal("ResourceAlreadyExistsException")
err["Message"].should.contain(
"Member {0} has already voted on proposal {1}.".format(member_id, proposal_id)
) )
@ -643,10 +671,14 @@ def test_vote_on_proposal_alreadyvoted():
def test_list_proposal_votes_badnetwork(): def test_list_proposal_votes_badnetwork():
conn = boto3.client("managedblockchain", region_name="us-east-1") conn = boto3.client("managedblockchain", region_name="us-east-1")
response = conn.list_proposal_votes.when.called_with( with pytest.raises(ClientError) as ex:
NetworkId="n-ABCDEFGHIJKLMNOP0123456789", conn.list_proposal_votes(
ProposalId="p-ABCDEFGHIJKLMNOP0123456789", NetworkId="n-ABCDEFGHIJKLMNOP0123456789",
).should.throw(Exception, "Network n-ABCDEFGHIJKLMNOP0123456789 not found") ProposalId="p-ABCDEFGHIJKLMNOP0123456789",
)
err = ex.value.response["Error"]
err["Code"].should.equal("ResourceNotFoundException")
err["Message"].should.contain("Network n-ABCDEFGHIJKLMNOP0123456789 not found")
@mock_managedblockchain @mock_managedblockchain
@ -665,6 +697,10 @@ def test_list_proposal_votes_badproposal():
network_id = response["NetworkId"] network_id = response["NetworkId"]
member_id = response["MemberId"] member_id = response["MemberId"]
response = conn.list_proposal_votes.when.called_with( with pytest.raises(ClientError) as ex:
NetworkId=network_id, ProposalId="p-ABCDEFGHIJKLMNOP0123456789", conn.list_proposal_votes(
).should.throw(Exception, "Proposal p-ABCDEFGHIJKLMNOP0123456789 not found") NetworkId=network_id, ProposalId="p-ABCDEFGHIJKLMNOP0123456789",
)
err = ex.value.response["Error"]
err["Code"].should.equal("ResourceNotFoundException")
err["Message"].should.contain("Proposal p-ABCDEFGHIJKLMNOP0123456789 not found")