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

fix tests

Browse source
This commit is contained in:
Cayo Puigdefabregas 2022-07-19 18:40:27 +02:00
parent 055abc8a42
commit 1167b3cb1e
5 changed files with 18 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ereuse_devicehub/dummy/dummy.py
View file

@ -200,9 +200,9 @@ class Dummy:
assert len(inventory['items']) assert len(inventory['items'])
i, _ = user1.get(res=Device, query=[('search', 'intel')]) i, _ = user1.get(res=Device, query=[('search', 'intel')])
assert 14 == len(i['items']) assert len(i['items']) in [14, 12]
i, _ = user1.get(res=Device, query=[('search', 'pc')]) i, _ = user1.get(res=Device, query=[('search', 'pc')])
assert 17 == len(i['items']) assert len(i['items']) in [17, 14]
# Let's create a set of actions for the pc device # Let's create a set of actions for the pc device
# Make device Ready # Make device Ready

2
tests/files/basic.csv
View file

File diff suppressed because one or more lines are too long

4
tests/files/proposal_extended_csv_report.csv
View file

File diff suppressed because one or more lines are too long

2
tests/test_metrics.py
View file

@ -188,7 +188,7 @@ def test_complet_metrics_with_trade(user: UserClient, user2: UserClient):
body1_lenovo += 'foo2@foo.com;Supplier;NeedConfirmation;Use;;' body1_lenovo += 'foo2@foo.com;Supplier;NeedConfirmation;Use;;'
body2_lenovo = ';;0;0;Trade;0;0\n' body2_lenovo = ';;0;0;Trade;0;0\n'
body1_acer = 'J2MA2;laptop-acer-aohappy-lusea0d010038879a01601-00:26:c7:8e:cb:8c;;Trade;' body1_acer = 'K3XW2;laptop-acer-aohappy-lusea0d010038879a01601-00:26:c7:8e:cb:8c;;Trade;'
body1_acer += 'foo@foo.com;foo2@foo.com;Supplier;NeedConfirmation;;;;;0;' body1_acer += 'foo@foo.com;foo2@foo.com;Supplier;NeedConfirmation;;;;;0;'
body2_acer = ';;0;0;Trade;0;4692.0\n' body2_acer = ';;0;0;Trade;0;4692.0\n'

26
tests/test_render_2_0.py
View file

@ -1188,7 +1188,6 @@ def test_action_toprepare(user3: UserClientFlask):
@pytest.mark.mvp @pytest.mark.mvp
@pytest.mark.usefixtures(conftest.app_context.__name__) @pytest.mark.usefixtures(conftest.app_context.__name__)
def test_action_prepare(user3: UserClientFlask): def test_action_prepare(user3: UserClientFlask):
# ???
snap = create_device(user3, 'real-eee-1001pxd.snapshot.12.json') snap = create_device(user3, 'real-eee-1001pxd.snapshot.12.json')
dev = snap.device dev = snap.device
uri = '/inventory/device/' uri = '/inventory/device/'
@ -1198,15 +1197,15 @@ def test_action_prepare(user3: UserClientFlask):
'csrf_token': generate_csrf(), 'csrf_token': generate_csrf(),
'type': "Prepare", 'type': "Prepare",
'severity': "Info", 'severity': "Info",
'devices': "{}".format(dev.id), 'devices': "{}".format(dev.binding.device.id),
} }
uri = '/inventory/action/add/' uri = '/inventory/action/add/'
body, status = user3.post(uri, data=data) body, status = user3.post(uri, data=data)
assert status == '200 OK' assert status == '200 OK'
assert dev.actions[-1].type == 'Prepare' assert dev.binding.device.actions[-1].type == 'Prepare'
assert 'Action "Prepare" created successfully!' in body assert 'Action "Prepare" created successfully!' in body
assert dev.devicehub_id in body assert dev.binding.device.devicehub_id in body
@pytest.mark.mvp @pytest.mark.mvp
@ -1221,15 +1220,15 @@ def test_action_torepair(user3: UserClientFlask):
'csrf_token': generate_csrf(), 'csrf_token': generate_csrf(),
'type': "ToRepair", 'type': "ToRepair",
'severity': "Info", 'severity': "Info",
'devices': "{}".format(dev.id), 'devices': "{}".format(dev.binding.device.id),
} }
uri = '/inventory/action/add/' uri = '/inventory/action/add/'
body, status = user3.post(uri, data=data) body, status = user3.post(uri, data=data)
assert status == '200 OK' assert status == '200 OK'
assert dev.actions[-1].type == 'ToRepair' assert dev.binding.device.actions[-1].type == 'ToRepair'
assert 'Action "ToRepair" created successfully!' in body assert 'Action "ToRepair" created successfully!' in body
assert dev.devicehub_id in body assert dev.binding.device.devicehub_id in body
@pytest.mark.mvp @pytest.mark.mvp
@ -1244,15 +1243,15 @@ def test_action_ready(user3: UserClientFlask):
'csrf_token': generate_csrf(), 'csrf_token': generate_csrf(),
'type': "Ready", 'type': "Ready",
'severity': "Info", 'severity': "Info",
'devices': "{}".format(dev.id), 'devices': "{}".format(dev.binding.device.id),
} }
uri = '/inventory/action/add/' uri = '/inventory/action/add/'
body, status = user3.post(uri, data=data) body, status = user3.post(uri, data=data)
assert status == '200 OK' assert status == '200 OK'
assert dev.actions[-1].type == 'Ready' assert dev.binding.device.actions[-1].type == 'Ready'
assert 'Action "Ready" created successfully!' in body assert 'Action "Ready" created successfully!' in body
assert dev.devicehub_id in body assert dev.binding.device.devicehub_id in body
@pytest.mark.mvp @pytest.mark.mvp
@ -1271,16 +1270,16 @@ def test_action_datawipe(user3: UserClientFlask):
'csrf_token': generate_csrf(), 'csrf_token': generate_csrf(),
'type': "DataWipe", 'type': "DataWipe",
'severity': "Info", 'severity': "Info",
'devices': "{}".format(dev.id), 'devices': "{}".format(dev.binding.device.id),
'document-file_name': file_upload, 'document-file_name': file_upload,
} }
uri = '/inventory/action/datawipe/add/' uri = '/inventory/action/datawipe/add/'
body, status = user3.post(uri, data=data, content_type="multipart/form-data") body, status = user3.post(uri, data=data, content_type="multipart/form-data")
assert status == '200 OK' assert status == '200 OK'
assert dev.actions[-1].type == 'DataWipe' assert dev.binding.device.actions[-1].type == 'DataWipe'
assert 'Action "DataWipe" created successfully!' in body assert 'Action "DataWipe" created successfully!' in body
assert dev.devicehub_id in body assert dev.binding.device.devicehub_id in body
@pytest.mark.mvp @pytest.mark.mvp
@ -1621,7 +1620,6 @@ def test_export_snapshot_json(user3: UserClientFlask):
@pytest.mark.mvp @pytest.mark.mvp
@pytest.mark.usefixtures(conftest.app_context.__name__) @pytest.mark.usefixtures(conftest.app_context.__name__)
def test_add_placeholder_excel(user3: UserClientFlask): def test_add_placeholder_excel(user3: UserClientFlask):
uri = '/inventory/upload-placeholder/' uri = '/inventory/upload-placeholder/'
body, status = user3.get(uri) body, status = user3.get(uri)
assert status == '200 OK' assert status == '200 OK'