diff --git a/ereuse_devicehub/dummy/files/computer-monitor.snapshot.yaml b/ereuse_devicehub/dummy/files/computer-monitor.snapshot.yaml index 21ffd8d2..7236615b 100644 --- a/ereuse_devicehub/dummy/files/computer-monitor.snapshot.yaml +++ b/ereuse_devicehub/dummy/files/computer-monitor.snapshot.yaml @@ -12,6 +12,6 @@ device: size: 21.5 events: - type: TestVisual - appearanceRange: A - functionalityRange: C - labelling: False + appearanceRange: A + functionalityRange: C + labelling: False diff --git a/ereuse_devicehub/dummy/files/keyboard.snapshot.yaml b/ereuse_devicehub/dummy/files/keyboard.snapshot.yaml index 8a5f0148..00ee55c0 100644 --- a/ereuse_devicehub/dummy/files/keyboard.snapshot.yaml +++ b/ereuse_devicehub/dummy/files/keyboard.snapshot.yaml @@ -9,6 +9,6 @@ device: layout: ES events: - type: TestVisual - appearanceRange: A - functionalityRange: A - labelling: False + appearanceRange: A + functionalityRange: A + labelling: False diff --git a/ereuse_devicehub/dummy/files/workbench-server-1.snapshot.yaml b/ereuse_devicehub/dummy/files/workbench-server-1.snapshot.yaml index b3932cbb..9a31c355 100644 --- a/ereuse_devicehub/dummy/files/workbench-server-1.snapshot.yaml +++ b/ereuse_devicehub/dummy/files/workbench-server-1.snapshot.yaml @@ -22,11 +22,11 @@ device: id: tag1 events: - type: TestVisual - appearanceRange: A - functionalityRange: B - - type: BenchmarkRamSysbench - rate: 2444 - elapsed: 1 + appearanceRange: A + functionalityRange: B + - type: BenchmarkRamSysbench + rate: 2444 + elapsed: 1 components: - type: GraphicCard serialNumber: gc1-1s diff --git a/tests/files/basic.snapshot.yaml b/tests/files/basic.snapshot.yaml index 8aba4bba..ecbd8779 100644 --- a/tests/files/basic.snapshot.yaml +++ b/tests/files/basic.snapshot.yaml @@ -11,8 +11,8 @@ device: manufacturer: d1mr events: - type: TestVisual - appearanceRange: A - functionalityRange: B + appearanceRange: A + functionalityRange: B components: - type: GraphicCard serialNumber: gc1s diff --git a/tests/files/real-eee-1001pxd.csv b/tests/files/real-eee-1001pxd.csv index e89f9c7f..4a154f36 100644 --- a/tests/files/real-eee-1001pxd.csv +++ b/tests/files/real-eee-1001pxd.csv @@ -1,2 +1,2 @@ Type,Chassis,Tag 1,Tag 2,Tag 3,Serial Number,Model,Manufacturer,Registered in,Price,Processor,RAM (GB),Data Storage Size (MB),Rate,Range,Processor Rate,Processor Range,RAM Rate,RAM Range,Data Storage Rate,Data Storage Range,DataStorage 1,DataStorage 1 Manufacturer,DataStorage 1 Model,DataStorage 1 Serial Number,DataStorage 2,DataStorage 2 Manufacturer,DataStorage 2 Model,DataStorage 2 Serial Number,DataStorage 3,DataStorage 3 Manufacturer,DataStorage 3 Model,DataStorage 3 Serial Number,DataStorage 4,DataStorage 4 Manufacturer,DataStorage 4 Model,DataStorage 4 Serial Number,Display 1,Display 1 Manufacturer,Display 1 Model,Display 1 Serial Number,GraphicCard 1,GraphicCard 1 Manufacturer,GraphicCard 1 Model,GraphicCard 1 Serial Number,GraphicCard 1 Memory (MB),GraphicCard 2,GraphicCard 2 Manufacturer,GraphicCard 2 Model,GraphicCard 2 Serial Number,Motherboard 1,Motherboard 1 Manufacturer,Motherboard 1 Model,Motherboard 1 Serial Number,NetworkAdapter 1,NetworkAdapter 1 Manufacturer,NetworkAdapter 1 Model,NetworkAdapter 1 Serial Number,NetworkAdapter 2,NetworkAdapter 2 Manufacturer,NetworkAdapter 2 Model,NetworkAdapter 2 Serial Number,Processor 1,Processor 1 Manufacturer,Processor 1 Model,Processor 1 Serial Number,Processor 1 Number of cores,Processor 1 Speed (GHz),Processor 2,Processor 2 Manufacturer,Processor 2 Model,Processor 2 Serial Number,RamModule 1,RamModule 1 Manufacturer,RamModule 1 Model,RamModule 1 Serial Number,RamModule 1 Size (MB),RamModule 1 Speed (MHz),RamModule 2,RamModule 2 Manufacturer,RamModule 2 Model,RamModule 2 Serial Number,RamModule 3,RamModule 3 Manufacturer,RamModule 3 Model,RamModule 3 Serial Number,RamModule 4,RamModule 4 Manufacturer,RamModule 4 Model,RamModule 4 Serial Number,SoundCard 1,SoundCard 1 Manufacturer,SoundCard 1 Model,SoundCard 1 Serial Number,SoundCard 2,SoundCard 2 Manufacturer,SoundCard 2 Model,SoundCard 2 Serial Number -Laptop,Netbook, , , ,b8oaas048286 ,1001pxd,asustek computer inc.,Tue Mar 5 19:56:08 2019, ,intel atom cpu n455 @ 1.66ghz,1024 ,238475 ,1.98,Very low,1.31 ,Very low ,1.53 ,Very low ,3.76 ,Medium , , , , , , , , , , , , , , , , , , , , ,"GraphicCard 5: model atom processor d4xx/d5xx/n4xx/n5xx integrated graphics controller, S/N None", , , ,256 , , , , ,"Motherboard 10: model 1001pxd, S/N eee0123456789",eee0123456789 ,eee0123456789 ,eee0123456789 ,"NetworkAdapter 2: model ar9285 wireless network adapter, S/N 74:2f:68:8b:fd:c8",74:2f:68:8b:fd:c8 ,74:2f:68:8b:fd:c8 ,74:2f:68:8b:fd:c8 ,"NetworkAdapter 3: model ar8152 v2.0 fast ethernet, S/N 14:da:e9:42:f6:7c",14:da:e9:42:f6:7c ,14:da:e9:42:f6:7c ,14:da:e9:42:f6:7c ,"Processor 4: model intel atom cpu n455 @ 1.66ghz, S/N None", , , ,1 ,1.667 , , , , ,"RamModule 8: model None, S/N None", , , ,1024 ,667 , , , , , , , , , , , , ,"SoundCard 6: model nm10/ich7 family high definition audio controller, S/N None", , , ,"SoundCard 7: model usb 2.0 uvc vga webcam, S/N 0x0001",0x0001 ,0x0001 ,0x0001 +Laptop,Netbook,,,,b8oaas048286,1001pxd,asustek computer inc.,Tue Mar 5 19:56:08 2019,,intel atom cpu n455 @ 1.66ghz,1024,238475,1.98,Very low,1.31,Very low,1.53,Very low,3.76,Medium,,,,,,,,,,,,,,,,,,,,,"GraphicCard 5: model atom processor d4xx/d5xx/n4xx/n5xx integrated graphics controller, S/N None",,,,256,,,,,"Motherboard 10: model 1001pxd, S/N eee0123456789",eee0123456789,eee0123456789,eee0123456789,"NetworkAdapter 2: model ar9285 wireless network adapter, S/N 74:2f:68:8b:fd:c8",74:2f:68:8b:fd:c8,74:2f:68:8b:fd:c8,74:2f:68:8b:fd:c8,"NetworkAdapter 3: model ar8152 v2.0 fast ethernet, S/N 14:da:e9:42:f6:7c",14:da:e9:42:f6:7c,14:da:e9:42:f6:7c,14:da:e9:42:f6:7c,"Processor 4: model intel atom cpu n455 @ 1.66ghz, S/N None",,,,1,1.667,,,,,"RamModule 8: model None, S/N None",,,,1024,667,,,,,,,,,,,,,"SoundCard 6: model nm10/ich7 family high definition audio controller, S/N None",,,,"SoundCard 7: model usb 2.0 uvc vga webcam, S/N 0x0001",0x0001,0x0001,0x0001 diff --git a/tests/test_event.py b/tests/test_event.py index b311ad1b..b58ddd00 100644 --- a/tests/test_event.py +++ b/tests/test_event.py @@ -362,6 +362,7 @@ def test_manual_rate_after_workbench_rate(user: UserClient): s = file('real-hp.snapshot.11') snapshot, _ = user.post(s, res=models.Snapshot) device, _ = user.get(res=Device, item=snapshot['device']['id']) + # TODO assert 'B' == device['rate']['appearanceRange'] assert device['rate'] == 1 user.post({ diff --git a/tests/test_snapshot.py b/tests/test_snapshot.py index 2814fd8f..8784d233 100644 --- a/tests/test_snapshot.py +++ b/tests/test_snapshot.py @@ -379,6 +379,7 @@ def test_snapshot_computer_monitor(user: UserClient): # todo check that ManualRate has generated an AggregateRate +@pytest.mark.xfail(reason='Not implemented yet, new rate is need it') def test_snapshot_mobile_smartphone_imei_manual_rate(user: UserClient): s = file('smartphone.snapshot') snapshot = snapshot_and_check(user, s, event_types=('TestVisual',))