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

Merge branch 'testing' into dpp

This commit is contained in:
Cayo Puigdefabregas 2023-06-16 13:12:38 +02:00
parent a6684999a8 99f4c71ee1
commit 1f78c184b5
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/files/devices_lots.csv
View File

@ -1,2 +1,2 @@
"DHID";"Lot Id";"Lot Name";"Lot Type";"Transfer Status";"Transfer Code";"Transfer Date";"Transfer Creation Date";"Transfer Update Date" "DHID";"Lot Id";"Lot Name";"Lot Type";"Transfer Status";"Transfer Code";"Transfer Date";"Transfer Creation Date";"Transfer Update Date"
"O48N2";"b33c5a0d-bc80-453f-805a-560fab88a761";"lot1";"Temporary";"";"";"";"";"" "93652";"b33c5a0d-bc80-453f-805a-560fab88a761";"lot1";"Temporary";"";"";"";"";""

1 DHID Lot Id Lot Name Lot Type Transfer Status Transfer Code Transfer Date Transfer Creation Date Transfer Update Date
2 O48N2 93652 b33c5a0d-bc80-453f-805a-560fab88a761 lot1 Temporary

6
tests/test_metrics.py
View File

@ -160,7 +160,7 @@ def test_metrics_action_status(user: UserClient, user2: UserClient):
head += '"Status Supplier – Created Date";"Status Receiver – Created Date";"Trade-Weight";' head += '"Status Supplier – Created Date";"Status Receiver – Created Date";"Trade-Weight";'
head += '"Action-Create";"Allocate-Start";"Allocate-User-Code";"Allocate-NumUsers";' head += '"Action-Create";"Allocate-Start";"Allocate-User-Code";"Allocate-NumUsers";'
head += '"UsageTimeAllocate";"Type";"LiveCreate";"UsageTimeHdd"\n' head += '"UsageTimeAllocate";"Type";"LiveCreate";"UsageTimeHdd"\n'
body = '"O48N2";"adebcc5506213fac43cd8473a9c81bcf0cadaed9cb98b2eae651e377a3533c5a";' body = '"93652";"adebcc5506213fac43cd8473a9c81bcf0cadaed9cb98b2eae651e377a3533c5a";'
body += '"";"Status";"";"foo@foo.com";"Receiver";"";"";"Use";"";"' body += '"";"Status";"";"foo@foo.com";"Receiver";"";"";"Use";"";"'
assert head in csv_str assert head in csv_str
assert body in csv_str assert body in csv_str
@ -207,7 +207,7 @@ def test_complet_metrics_with_trade(user: UserClient, user2: UserClient):
query=[('filter', {'type': ['Computer'], 'ids': devices_id})], query=[('filter', {'type': ['Computer'], 'ids': devices_id})],
) )
body1_lenovo = '"O48N2";"adebcc5506213fac43cd8473a9c81bcf0cadaed9cb98b2eae651e377a3533c5a";"";"Trade";"foo@foo.com";' body1_lenovo = '"93652";"adebcc5506213fac43cd8473a9c81bcf0cadaed9cb98b2eae651e377a3533c5a";"";"Trade";"foo@foo.com";'
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'
@ -232,7 +232,7 @@ def test_complet_metrics_with_trade(user: UserClient, user2: UserClient):
query=[('filter', {'type': ['Computer'], 'ids': devices_id})], query=[('filter', {'type': ['Computer'], 'ids': devices_id})],
) )
body1_lenovo = '"O48N2";"adebcc5506213fac43cd8473a9c81bcf0cadaed9cb98b2eae651e377a3533c5a";"";"Trade";"foo@foo.com";' body1_lenovo = '"93652";"adebcc5506213fac43cd8473a9c81bcf0cadaed9cb98b2eae651e377a3533c5a";"";"Trade";"foo@foo.com";'
body1_lenovo += '"foo2@foo.com";"Supplier";"NeedConfirmation";"Use";"Use";' body1_lenovo += '"foo2@foo.com";"Supplier";"NeedConfirmation";"Use";"Use";'
body2_lenovo = ';"";"0";"0";"Trade";"0";"0"\n' body2_lenovo = ';"";"0";"0";"Trade";"0";"0"\n'
body2_acer = ';"";"0";"0";"Trade";"0";"4692.0"\n' body2_acer = ';"";"0";"0";"Trade";"0";"4692.0"\n'

10
tests/test_render_2_0.py
View File

@ -531,7 +531,7 @@ def test_add_monitor(user3: UserClientFlask):
assert dev.placeholder.id_device_supplier == "b2" assert dev.placeholder.id_device_supplier == "b2"
assert dev.hid == 'monitor-samsung-lc27t55-aaaab' assert dev.hid == 'monitor-samsung-lc27t55-aaaab'
assert phid == '1' assert phid == '1'
assert dhid == 'O48N2' assert dhid == '93652'
txt = f'Device "{typ}" placeholder with PHID {phid} and DHID {dhid} ' txt = f'Device "{typ}" placeholder with PHID {phid} and DHID {dhid} '
txt += 'created successfully' txt += 'created successfully'
@ -571,7 +571,7 @@ def test_update_monitor(user3: UserClientFlask):
assert dev.placeholder.id_device_supplier == "b2" assert dev.placeholder.id_device_supplier == "b2"
assert dev.hid == 'monitor-samsung-lc27t55-aaaab' assert dev.hid == 'monitor-samsung-lc27t55-aaaab'
assert phid == '1' assert phid == '1'
assert dhid == 'O48N2' assert dhid == '93652'
assert dev.model == 'lc27t55' assert dev.model == 'lc27t55'
assert dev.depth == 0.1 assert dev.depth == 0.1
assert dev.placeholder.pallet == "l34" assert dev.placeholder.pallet == "l34"
@ -640,7 +640,7 @@ def test_add_2_monitor(user3: UserClientFlask):
assert dev.placeholder.id_device_supplier == "b1" assert dev.placeholder.id_device_supplier == "b1"
assert dev.hid == 'monitor-samsung-lc27t55-aaaab' assert dev.hid == 'monitor-samsung-lc27t55-aaaab'
assert phid == '1' assert phid == '1'
assert dhid == 'O48N2' assert dhid == '93652'
assert dev.model == 'lc27t55' assert dev.model == 'lc27t55'
assert dev.placeholder.pallet == "l34" assert dev.placeholder.pallet == "l34"
@ -717,7 +717,7 @@ def test_add_laptop(user3: UserClientFlask):
dev.chid == '274f05421e4d394c5b3cd10266fed6f0500029b104b5db3521689bda589e3150' dev.chid == '274f05421e4d394c5b3cd10266fed6f0500029b104b5db3521689bda589e3150'
) )
assert phid == '1' assert phid == '1'
assert dhid == 'O48N2' assert dhid == '93652'
txt = f'Device "{typ}" placeholder with PHID {phid} and DHID {dhid} ' txt = f'Device "{typ}" placeholder with PHID {phid} and DHID {dhid} '
txt += 'created successfully' txt += 'created successfully'
@ -1891,7 +1891,7 @@ def test_edit_laptop(user3: UserClientFlask):
assert dev.serial_number == 'aaaab' assert dev.serial_number == 'aaaab'
assert dev.model == 'lc27t55' assert dev.model == 'lc27t55'
assert phid == '1' assert phid == '1'
assert dhid == 'O48N2' assert dhid == '93652'
txt = f'Device "{typ}" placeholder with PHID {phid} and DHID {dhid} ' txt = f'Device "{typ}" placeholder with PHID {phid} and DHID {dhid} '
txt += 'created successfully' txt += 'created successfully'