trustchain-oc1-orchestral
/
devicehub-teal
Archived
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixing tests

This commit is contained in:
Cayo Puigdefabregas 2021-03-25 11:26:30 +01:00
parent 4a16091b04
commit 45b44ce17b
2 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ereuse_devicehub/resources/action/__init__.py
View File

@ -250,6 +250,11 @@ class MakeAvailable(ActionDef):
SCHEMA = schemas.MakeAvailable SCHEMA = schemas.MakeAvailable
class TradeDef(ActionDef):
VIEW = None
SCHEMA = schemas.Trade
class CancelTradeDef(ActionDef): class CancelTradeDef(ActionDef):
VIEW = None VIEW = None
SCHEMA = schemas.CancelTrade SCHEMA = schemas.CancelTrade

16
tests/test_action.py
View File

@ -747,7 +747,7 @@ def test_deallocate_bad_dates(user: UserClient):
(models.Rent, states.Trading.Renting), (models.Rent, states.Trading.Renting),
(models.DisposeProduct, states.Trading.ProductDisposed) (models.DisposeProduct, states.Trading.ProductDisposed)
])) ]))
def test_trade2(action_model_state: Tuple[Type[models.Action], states.Trading], user: UserClient): def test_trade(action_model_state: Tuple[Type[models.Action], states.Trading], user: UserClient):
"""Tests POSTing all Trade actions.""" """Tests POSTing all Trade actions."""
# todo missing None states.Trading for after cancelling renting, for example # todo missing None states.Trading for after cancelling renting, for example
# import pdb; pdb.set_trace() # import pdb; pdb.set_trace()
@ -769,20 +769,6 @@ def test_trade2(action_model_state: Tuple[Type[models.Action], states.Trading],
assert device['trading'] == state.name assert device['trading'] == state.name
@pytest.mark.mvp
def test_trade(user: UserClient, user2: UserClient):
"""Tests POST one simple Trade action with both users as system users."""
# import pdb; pdb.set_trace()
snapshot, _ = user.post(file('basic.snapshot'), res=models.Snapshot)
action = {
'type': 'Trade',
'devices': [snapshot['device']['id']],
'user_to': user2.user['email']
}
action, _ = user.post(action, res=models.Action)
assert action['devices'][0]['id'] == snapshot['device']['id']
@pytest.mark.mvp @pytest.mark.mvp
@pytest.mark.usefixtures(conftest.auth_app_context.__name__) @pytest.mark.usefixtures(conftest.auth_app_context.__name__)
def test_price_custom(): def test_price_custom():