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

resolve conflict

This commit is contained in:
Cayo Puigdefabregas 2021-04-09 14:57:26 +02:00
parent 2ab9afa1e4 9d4e0d934e
commit eae5422d42
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ereuse_devicehub/dummy/dummy.py
View File

@ -115,12 +115,13 @@ class Dummy:
user1.post({'type': model.t, 'devices': [pc]}, res=m.Action) user1.post({'type': model.t, 'devices': [pc]}, res=m.Action)
# Perform a Sell to several devices # Perform a Sell to several devices
user1.post( # user1.post(
{ # {
'type': m.Sell.t, # 'type': m.Sell.t,
'devices': list(itertools.islice(pcs, len(pcs) // 2)) # 'to': user1.user['individuals'][0]['id'],
}, # 'devices': list(itertools.islice(pcs, len(pcs) // 2))
res=m.Action) # },
# res=m.Action)
lot_user, _ = user1.post({'name': 'LoteStephan'}, res=Lot) lot_user, _ = user1.post({'name': 'LoteStephan'}, res=Lot)
@ -170,12 +171,13 @@ class Dummy:
res=m.Action) res=m.Action)
# todo test reserve # todo test reserve
user1.post( # Sell device # user1.post( # Sell device
{ # {
'type': m.Sell.t, # 'type': m.Sell.t,
'devices': [sample_pc] # 'to': user1.user['individuals'][0]['id'],
}, # 'devices': [sample_pc]
res=m.Action) # },
# res=m.Action)
# todo Receive # todo Receive
user1.get(res=Device, item=sample_pc) # Test user1.get(res=Device, item=sample_pc) # Test