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

resolv conflicts with csv files

This commit is contained in:
Cayo Puigdefabregas 2022-05-16 19:17:11 +02:00
parent 0206f831b2
commit db5bbeb796
5 changed files with 9 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/files/basic-stock.csv
View File

@ -1,7 +1,2 @@
<<<<<<< HEAD Type;Chassis;Serial Number;Model;Manufacturer;Registered in;Physical state;Allocate state;Lifecycle state;Price;Processor;RAM (MB);Data Storage Size (MB)
Type;Chassis;Serial Number;Model;Manufacturer;Registered in;Physical state;Trading state;Price;Processor;RAM (MB);Data Storage Size (MB) Desktop;Microtower;d1s;d1ml;d1mr;Mon May 16 19:08:44 2022;;;;;p1ml;0;0
Desktop;Microtower;d1s;d1ml;d1mr;Tue Mar 29 18:13:05 2022;;;;p1ml;0;0
=======
Type;Chassis;Serial Number;Model;Manufacturer;Registered in;Physical state;Allocate state;Lifecycle state;Price;Processor;RAM (MB);Data Storage Size (MB);Rate;Range;Processor Rate;Processor Range;RAM Rate;RAM Range;Data Storage Rate;Data Storage Range
Desktop;Microtower;d1s;d1ml;d1mr;Mon May 16 09:34:22 2022;;;;;p1ml;0;0;1.0;Very low;1.0;Very low;1.0;Very low;1.0;Very low
>>>>>>> testing

1 <<<<<<< HEAD Type Chassis Serial Number Model Manufacturer Registered in Physical state Allocate state Lifecycle state Price Processor RAM (MB) Data Storage Size (MB)
2 Type;Chassis;Serial Number;Model;Manufacturer;Registered in;Physical state;Trading state;Price;Processor;RAM (MB);Data Storage Size (MB) Desktop Microtower d1s d1ml d1mr Mon May 16 19:08:44 2022 p1ml 0 0
Desktop;Microtower;d1s;d1ml;d1mr;Tue Mar 29 18:13:05 2022;;;;p1ml;0;0
=======
Type;Chassis;Serial Number;Model;Manufacturer;Registered in;Physical state;Allocate state;Lifecycle state;Price;Processor;RAM (MB);Data Storage Size (MB);Rate;Range;Processor Rate;Processor Range;RAM Rate;RAM Range;Data Storage Rate;Data Storage Range
Desktop;Microtower;d1s;d1ml;d1mr;Mon May 16 09:34:22 2022;;;;;p1ml;0;0;1.0;Very low;1.0;Very low;1.0;Very low;1.0;Very low
>>>>>>> testing

7
tests/files/basic.csv
View File

File diff suppressed because one or more lines are too long

7
tests/files/export_devices.csv
View File

File diff suppressed because one or more lines are too long

10
tests/files/proposal_extended_csv_report.csv
View File

File diff suppressed because one or more lines are too long

7
tests/test_documents.py
View File

@ -502,6 +502,7 @@ def test_report_devices_stock_control(user: UserClient, user2: UserClient):
accept='text/csv', accept='text/csv',
query=[('filter', {'type': ['Computer']})], query=[('filter', {'type': ['Computer']})],
) )
f = StringIO(csv_str) f = StringIO(csv_str)
obj_csv = csv.reader(f, f) obj_csv = csv.reader(f, f)
export_csv = list(obj_csv) export_csv = list(obj_csv)
@ -526,14 +527,12 @@ def test_report_devices_stock_control(user: UserClient, user2: UserClient):
), 'Register in field is not a datetime' ), 'Register in field is not a datetime'
# Pop dates fields from csv lists to compare them # Pop dates fields from csv lists to compare them
fixture_csv[1] = fixture_csv[1][0].split(";")
fixture_csv[1] = fixture_csv[1][:5] + fixture_csv[1][6:] fixture_csv[1] = fixture_csv[1][:5] + fixture_csv[1][6:]
export_csv[1] = export_csv[1][:5] + export_csv[1][6:] export_csv[1] = export_csv[1][:5] + export_csv[1][6:]
export_header = [";".join(export_csv[0])] assert fixture_csv[0] == export_csv[0], 'Headers are not equal'
assert fixture_csv[0] == export_header, 'Headers are not equal'
assert fixture_csv[1] == export_csv[1], 'Computer information are not equal' assert fixture_csv[1] == export_csv[1], 'Computer information are not equal'
assert fixture_csv == [export_header, export_csv[1]] assert fixture_csv == export_csv
@pytest.mark.mvp @pytest.mark.mvp