From 5a25564512454e7288393a6fde822592a6f0f0fa Mon Sep 17 00:00:00 2001 From: Aidan Timson Date: Sat, 9 Mar 2024 12:34:35 +0000 Subject: [PATCH] Move fixtures for modules into submodule (#24) --- .../fixtures/modules/__init__.py | 1 + .../fixtures/modules/battery.py | 8 ++ systembridgemodels/fixtures/modules/cpu.py | 63 +++++++++++ systembridgemodels/fixtures/modules/disks.py | 48 ++++++++ .../fixtures/modules/displays.py | 18 +++ systembridgemodels/fixtures/modules/gpus.py | 19 ++++ systembridgemodels/fixtures/modules/media.py | 27 +++++ systembridgemodels/fixtures/modules/memory.py | 26 +++++ .../fixtures/modules/networks.py | 57 ++++++++++ .../fixtures/modules/processes.py | 16 +++ .../fixtures/modules/sensors.py | 104 ++++++++++++++++++ systembridgemodels/fixtures/modules/system.py | 33 ++++++ tests/modules/test_battery.py | 9 +- tests/modules/test_cpu.py | 72 +----------- tests/modules/test_disks.py | 51 +-------- tests/modules/test_displays.py | 19 +--- tests/modules/test_gpus.py | 20 +--- tests/modules/test_media.py | 28 +---- tests/modules/test_memory.py | 31 +----- tests/modules/test_networks.py | 50 +-------- tests/modules/test_processes.py | 17 +-- tests/modules/test_sensors.py | 95 +--------------- tests/modules/test_system.py | 34 +----- 23 files changed, 460 insertions(+), 386 deletions(-) create mode 100644 systembridgemodels/fixtures/modules/__init__.py create mode 100644 systembridgemodels/fixtures/modules/battery.py create mode 100644 systembridgemodels/fixtures/modules/cpu.py create mode 100644 systembridgemodels/fixtures/modules/disks.py create mode 100644 systembridgemodels/fixtures/modules/displays.py create mode 100644 systembridgemodels/fixtures/modules/gpus.py create mode 100644 systembridgemodels/fixtures/modules/media.py create mode 100644 systembridgemodels/fixtures/modules/memory.py create mode 100644 systembridgemodels/fixtures/modules/networks.py create mode 100644 systembridgemodels/fixtures/modules/processes.py create mode 100644 systembridgemodels/fixtures/modules/sensors.py create mode 100644 systembridgemodels/fixtures/modules/system.py diff --git a/systembridgemodels/fixtures/modules/__init__.py b/systembridgemodels/fixtures/modules/__init__.py new file mode 100644 index 0000000..7779af1 --- /dev/null +++ b/systembridgemodels/fixtures/modules/__init__.py @@ -0,0 +1 @@ +"""Fixtures for modules.""" diff --git a/systembridgemodels/fixtures/modules/battery.py b/systembridgemodels/fixtures/modules/battery.py new file mode 100644 index 0000000..1247c5c --- /dev/null +++ b/systembridgemodels/fixtures/modules/battery.py @@ -0,0 +1,8 @@ +"""Fixture for battery module.""" +from systembridgemodels.modules.battery import Battery + +FIXTURE_BATTERY = Battery( + is_charging=True, + percentage=98.4, + time_remaining=12, +) diff --git a/systembridgemodels/fixtures/modules/cpu.py b/systembridgemodels/fixtures/modules/cpu.py new file mode 100644 index 0000000..c1c73d3 --- /dev/null +++ b/systembridgemodels/fixtures/modules/cpu.py @@ -0,0 +1,63 @@ +"""Fixture for cpu module.""" +from systembridgemodels.modules.cpu import CPU, CPUFrequency, CPUStats, CPUTimes, PerCPU + +FIXTURE_CPU = CPU( + count=4, + frequency=CPUFrequency( + current=2.3, + min=0.8, + max=3.1, + ), + load_average=1.5, + per_cpu=[ + PerCPU( + id=0, + frequency=CPUFrequency( + current=2.3, + min=0.8, + max=3.1, + ), + power=50.0, + times=CPUTimes( + user=120.0, + system=30.0, + idle=600.0, + interrupt=0.0, + dpc=0.0, + ), + times_percent=CPUTimes( + user=20.0, + system=5.0, + idle=100.0, + interrupt=0.0, + dpc=0.0, + ), + usage=20.0, + voltage=1.2, + ) + ], + power=200.0, + stats=CPUStats( + ctx_switches=1000, + interrupts=500, + soft_interrupts=200, + syscalls=8000, + ), + temperature=45.0, + times=CPUTimes( + user=480.0, + system=120.0, + idle=2400.0, + interrupt=0.0, + dpc=0.0, + ), + times_percent=CPUTimes( + user=80.0, + system=20.0, + idle=400.0, + interrupt=0.0, + dpc=0.0, + ), + usage=80.0, + voltage=1.2, +) diff --git a/systembridgemodels/fixtures/modules/disks.py b/systembridgemodels/fixtures/modules/disks.py new file mode 100644 index 0000000..4307156 --- /dev/null +++ b/systembridgemodels/fixtures/modules/disks.py @@ -0,0 +1,48 @@ +"""Test fixtures for the disks module.""" +from systembridgemodels.modules.disks import ( + Disk, + DiskIOCounters, + DiskPartition, + Disks, + DiskUsage, +) + +FIXTURE_DISKS = Disks( + devices=[ + Disk( + name="name", + partitions=[ + DiskPartition( + device="device", + mount_point="mountpoint", + filesystem_type="fstype", + options="options", + max_file_size=1, + max_path_length=2, + usage=DiskUsage( + total=1, + used=2, + free=3, + percent=40.2, + ), + ), + ], + io_counters=DiskIOCounters( + read_bytes=1, + write_bytes=2, + read_count=3, + write_count=4, + read_time=5, + write_time=6, + ), + ) + ], + io_counters=DiskIOCounters( + read_bytes=1, + write_bytes=2, + read_count=3, + write_count=4, + read_time=5, + write_time=6, + ), +) diff --git a/systembridgemodels/fixtures/modules/displays.py b/systembridgemodels/fixtures/modules/displays.py new file mode 100644 index 0000000..c749bd8 --- /dev/null +++ b/systembridgemodels/fixtures/modules/displays.py @@ -0,0 +1,18 @@ +"""Fixtures for displays module.""" +from systembridgemodels.modules.displays import Display + +FIXTURE_DISPLAYS = [ + Display( + id="abc123", + name="name", + resolution_horizontal=1920, + resolution_vertical=1080, + x=1920, + y=1080, + width=1920, + height=1080, + is_primary=True, + pixel_clock=60.0, + refresh_rate=60.0, + ) +] diff --git a/systembridgemodels/fixtures/modules/gpus.py b/systembridgemodels/fixtures/modules/gpus.py new file mode 100644 index 0000000..9475639 --- /dev/null +++ b/systembridgemodels/fixtures/modules/gpus.py @@ -0,0 +1,19 @@ +"""Fixtures for GPU models.""" +from systembridgemodels.modules.gpus import GPU + +FIXTURE_GPUS = [ + GPU( + id="abc123", + name="name", + core_clock=1000.0, + core_load=100.0, + fan_speed=100.0, + memory_clock=1000.0, + memory_load=100.0, + memory_free=1000.0, + memory_used=1000.0, + memory_total=1000.0, + power_usage=100.0, + temperature=100.0, + ) +] diff --git a/systembridgemodels/fixtures/modules/media.py b/systembridgemodels/fixtures/modules/media.py new file mode 100644 index 0000000..0235f25 --- /dev/null +++ b/systembridgemodels/fixtures/modules/media.py @@ -0,0 +1,27 @@ +"""Fixtures for media models.""" +from systembridgemodels.modules.media import Media + +FIXTURE_MEDIA = Media( + album_artist="Album Artist", + album_title="Album Title", + artist="Artist", + duration=100, + is_fast_forward_enabled=True, + is_next_enabled=True, + is_pause_enabled=True, + is_play_enabled=True, + is_previous_enabled=True, + is_rewind_enabled=True, + is_stop_enabled=True, + playback_rate=1.0, + position=100, + repeat="repeat", + shuffle=True, + status="status", + subtitle="subtitle", + thumbnail="thumbnail", + title="title", + track_number=1, + type="type", + updated_at=100, +) diff --git a/systembridgemodels/fixtures/modules/memory.py b/systembridgemodels/fixtures/modules/memory.py new file mode 100644 index 0000000..f7359d5 --- /dev/null +++ b/systembridgemodels/fixtures/modules/memory.py @@ -0,0 +1,26 @@ +"""Fixture for memory module.""" +from systembridgemodels.modules.memory import Memory, MemorySwap, MemoryVirtual + +FIXTURE_MEMORY = Memory( + swap=MemorySwap( + total=1000, + used=500, + free=500, + percent=50.0, + sin=100, + sout=100, + ), + virtual=MemoryVirtual( + total=1000, + available=500, + percent=50.0, + used=500, + free=500, + active=500, + inactive=500, + buffers=500, + cached=500, + wired=500, + shared=500, + ), +) diff --git a/systembridgemodels/fixtures/modules/networks.py b/systembridgemodels/fixtures/modules/networks.py new file mode 100644 index 0000000..543b6ae --- /dev/null +++ b/systembridgemodels/fixtures/modules/networks.py @@ -0,0 +1,57 @@ +"""Fixture for networks module.""" + +from systembridgemodels.modules.networks import ( + Network, + NetworkAddress, + NetworkConnection, + NetworkIO, + Networks, + NetworkStats, +) + +FIXTURE_NETWORKS = Networks( + connections=[ + NetworkConnection( + fd=1, + family=2, + type=3, + laddr="laddr", + raddr="raddr", + status="status", + pid=4, + ) + ], + io=NetworkIO( + bytes_sent=1, + bytes_recv=2, + packets_sent=3, + packets_recv=4, + errin=5, + errout=6, + dropin=7, + dropout=8, + ), + networks=[ + Network( + name="name", + addresses=[ + NetworkAddress( + address="address", + netmask="netmask", + broadcast="broadcast", + ptp="ptp", + ) + ], + stats=NetworkStats( + isup=True, + duplex="duplex", + speed=1, + mtu=2, + flags=[ + "flag1", + "flag2", + ], + ), + ) + ], +) diff --git a/systembridgemodels/fixtures/modules/processes.py b/systembridgemodels/fixtures/modules/processes.py new file mode 100644 index 0000000..3f61a8f --- /dev/null +++ b/systembridgemodels/fixtures/modules/processes.py @@ -0,0 +1,16 @@ +"""Fixture for processes module.""" +from systembridgemodels.modules.processes import Process + +FIXTURE_PROCESSES = [ + Process( + id=1234, + name="name", + cpu_usage=12.3, + created=12.3, + memory_usage=12.3, + path="/path", + status="running", + username="username", + working_directory="/working/directory", + ) +] diff --git a/systembridgemodels/fixtures/modules/sensors.py b/systembridgemodels/fixtures/modules/sensors.py new file mode 100644 index 0000000..75345f8 --- /dev/null +++ b/systembridgemodels/fixtures/modules/sensors.py @@ -0,0 +1,104 @@ +"""Fixture for sensors module.""" +from systembridgemodels.modules.sensors import ( + Sensors, + SensorsNVIDIA, + SensorsNVIDIAChipset, + SensorsNVIDIADisplay, + SensorsNVIDIADriver, + SensorsNVIDIAGPU, + SensorsWindows, + SensorsWindowsHardware, + SensorsWindowsSensor, +) + +FIXTURE_SENSORS = Sensors( + fans=None, + temperatures=None, + windows_sensors=SensorsWindows( + hardware=[ + SensorsWindowsHardware( + id="id", + name="name", + type="type", + subhardware=[ + SensorsWindowsHardware( + id="id", + name="name", + type="type", + subhardware=[], + sensors=[ + SensorsWindowsSensor( + id="id", + name="name", + type="type", + value=12.3, + ) + ], + ) + ], + sensors=[ + SensorsWindowsSensor( + id="id", + name="name", + type="type", + value=12.3, + ) + ], + ) + ], + nvidia=SensorsNVIDIA( + chipset=SensorsNVIDIAChipset( + id=1234, + name="name", + flags="flags", + vendor_id=1234, + vendor_name="Vendor Name", + ), + displays=[ + SensorsNVIDIADisplay( + id=1234, + name="name", + active=True, + available=True, + connected=True, + dynamic=True, + aspect_horizontal=16, + aspect_vertical=9, + brightness_current=90, + brightness_default=80, + brightness_max=100, + brightness_min=0, + color_depth="Color Depth", + connection_type="Connection Type", + pixel_clock=60, + refresh_rate=144, + resolution_horizontal=1920, + resolution_vertical=1080, + ) + ], + driver=SensorsNVIDIADriver( + branch_version="Branch Version", + interface_version="Interface Version", + version=1234, + ), + gpus=[ + SensorsNVIDIAGPU( + id=1234, + name="name", + bios_oem_revision=1234, + bios_revision=1234, + bios_version="bios_version", + current_fan_speed_level=1234, + current_fan_speed_rpm=1234, + driver_model=1234, + memory_available=1234, + memory_capacity=1234, + memory_maker="Memory Maker", + serial="abc123", + system_type="System Type", + type="Type", + ) + ], + ), + ), +) diff --git a/systembridgemodels/fixtures/modules/system.py b/systembridgemodels/fixtures/modules/system.py new file mode 100644 index 0000000..2f88328 --- /dev/null +++ b/systembridgemodels/fixtures/modules/system.py @@ -0,0 +1,33 @@ +"""Fixture for system module.""" +from systembridgemodels.modules.system import System, SystemUser + +FIXTURE_SYSTEM = System( + boot_time=1234, + fqdn="hostname.local", + hostname="hostname", + ip_address_4="192.168.1.100", + mac_address="00:00:00:00:00:00", + platform_version="1.0.0", + platform="platform", + uptime=1234, + users=[ + SystemUser( + name="username", + active=True, + terminal="terminal", + host="host", + started=1234, + pid=1234, + ) + ], + uuid="uuid", + version="1.0.0", + camera_usage=[ + "camera1", + "camera2", + ], + ip_address_6="::1", + pending_reboot=True, + version_latest="4.99.0", + version_newer_available=True, +) diff --git a/tests/modules/test_battery.py b/tests/modules/test_battery.py index 892abe7..b056bd4 100644 --- a/tests/modules/test_battery.py +++ b/tests/modules/test_battery.py @@ -1,15 +1,12 @@ -"""Test the battery model.""" +"""Test the battery module model.""" +from systembridgemodels.fixtures.modules.battery import FIXTURE_BATTERY from systembridgemodels.modules.battery import Battery def test_battery(): """Test the battery model.""" - battery = Battery( - is_charging=True, - percentage=98.4, - time_remaining=12, - ) + battery = FIXTURE_BATTERY assert isinstance(battery, Battery) assert battery.is_charging is True assert battery.percentage == 98.4 diff --git a/tests/modules/test_cpu.py b/tests/modules/test_cpu.py index e6207d0..1982250 100644 --- a/tests/modules/test_cpu.py +++ b/tests/modules/test_cpu.py @@ -1,70 +1,10 @@ -"""Test the CPU model.""" +"""Test the CPU module model.""" from dataclasses import asdict +from systembridgemodels.fixtures.modules.cpu import FIXTURE_CPU from systembridgemodels.modules.cpu import CPU, CPUFrequency, CPUStats, CPUTimes, PerCPU -model = CPU( - count=4, - frequency=CPUFrequency( - current=2.3, - min=0.8, - max=3.1, - ), - load_average=1.5, - per_cpu=[ - PerCPU( - id=0, - frequency=CPUFrequency( - current=2.3, - min=0.8, - max=3.1, - ), - power=50.0, - times=CPUTimes( - user=120.0, - system=30.0, - idle=600.0, - interrupt=0.0, - dpc=0.0, - ), - times_percent=CPUTimes( - user=20.0, - system=5.0, - idle=100.0, - interrupt=0.0, - dpc=0.0, - ), - usage=20.0, - voltage=1.2, - ) - ], - power=200.0, - stats=CPUStats( - ctx_switches=1000, - interrupts=500, - soft_interrupts=200, - syscalls=8000, - ), - temperature=45.0, - times=CPUTimes( - user=480.0, - system=120.0, - idle=2400.0, - interrupt=0.0, - dpc=0.0, - ), - times_percent=CPUTimes( - user=80.0, - system=20.0, - idle=400.0, - interrupt=0.0, - dpc=0.0, - ), - usage=80.0, - voltage=1.2, -) - def _test_per_cpu(per_cpu: PerCPU): """Test the PerCPU model.""" @@ -89,7 +29,7 @@ def _test_per_cpu(per_cpu: PerCPU): assert per_cpu.voltage == 1.2 -def test_cpu(cpu: CPU = model): +def test_cpu(cpu: CPU = FIXTURE_CPU): """Test the CPU model.""" assert isinstance(cpu, CPU) assert cpu.count == 4 @@ -123,7 +63,7 @@ def test_cpu(cpu: CPU = model): def test_cpu_dict(): """Test CPU dict.""" - cpu_dict = asdict(model) + cpu_dict = asdict(FIXTURE_CPU) assert isinstance(cpu_dict["frequency"], dict) assert isinstance(cpu_dict["per_cpu"], list) assert isinstance(cpu_dict["per_cpu"][0], dict) @@ -145,9 +85,9 @@ def test_cpu_dict(): def test_cpu_per_cpu_dict(): """Test CPU PerCPU dict.""" - assert isinstance(model.per_cpu, list) + assert isinstance(FIXTURE_CPU.per_cpu, list) - per_cpu = model.per_cpu[0] + per_cpu = FIXTURE_CPU.per_cpu[0] per_cpu_dict = asdict(per_cpu) assert isinstance(per_cpu_dict["id"], int) assert isinstance(per_cpu_dict["frequency"], dict) diff --git a/tests/modules/test_disks.py b/tests/modules/test_disks.py index a036680..bab2a08 100644 --- a/tests/modules/test_disks.py +++ b/tests/modules/test_disks.py @@ -1,7 +1,8 @@ -"""Test the disks model.""" +"""Test the disks module model.""" from dataclasses import asdict +from systembridgemodels.fixtures.modules.disks import FIXTURE_DISKS from systembridgemodels.modules.disks import ( Disk, DiskIOCounters, @@ -10,46 +11,6 @@ DiskUsage, ) -model = Disks( - devices=[ - Disk( - name="name", - partitions=[ - DiskPartition( - device="device", - mount_point="mountpoint", - filesystem_type="fstype", - options="options", - max_file_size=1, - max_path_length=2, - usage=DiskUsage( - total=1, - used=2, - free=3, - percent=40.2, - ), - ), - ], - io_counters=DiskIOCounters( - read_bytes=1, - write_bytes=2, - read_count=3, - write_count=4, - read_time=5, - write_time=6, - ), - ) - ], - io_counters=DiskIOCounters( - read_bytes=1, - write_bytes=2, - read_count=3, - write_count=4, - read_time=5, - write_time=6, - ), -) - def _test_disk_partition(partition: DiskPartition): assert isinstance(partition, DiskPartition) @@ -81,7 +42,7 @@ def _test_disk(disk: Disk): assert disk.io_counters.write_time == 6 -def test_disks(disks: Disks = model): +def test_disks(disks: Disks = FIXTURE_DISKS): """Test the disks model.""" assert isinstance(disks, Disks) assert isinstance(disks.devices, list) @@ -90,7 +51,7 @@ def test_disks(disks: Disks = model): def test_disks_dict(): """Test disks dict.""" - disks_dict = asdict(model) + disks_dict = asdict(FIXTURE_DISKS) assert isinstance(disks_dict, dict) assert isinstance(disks_dict["devices"], list) assert isinstance(disks_dict["devices"][0], dict) @@ -129,7 +90,7 @@ def test_disks_dict(): def test_disks_devices_dict(): """Test disks devices dict.""" - disk_dict = asdict(model.devices[0]) + disk_dict = asdict(FIXTURE_DISKS.devices[0]) assert disk_dict["name"] == "name" assert isinstance(disk_dict["partitions"], list) assert isinstance(disk_dict["partitions"][0], dict) @@ -158,7 +119,7 @@ def test_disks_devices_dict(): def test_disks_devices_partition_dict(): """Test disks devices partition dict.""" - partition_dict = asdict(model.devices[0].partitions[0]) + partition_dict = asdict(FIXTURE_DISKS.devices[0].partitions[0]) assert partition_dict["device"] == "device" assert partition_dict["mount_point"] == "mountpoint" assert partition_dict["filesystem_type"] == "fstype" diff --git a/tests/modules/test_displays.py b/tests/modules/test_displays.py index 1ad0775..a2797bd 100644 --- a/tests/modules/test_displays.py +++ b/tests/modules/test_displays.py @@ -1,25 +1,12 @@ -"""Test the displays model.""" +"""Test the displays module model.""" +from systembridgemodels.fixtures.modules.displays import FIXTURE_DISPLAYS from systembridgemodels.modules.displays import Display def test_displays(): """Test the displays model.""" - displays = [ - Display( - id="abc123", - name="name", - resolution_horizontal=1920, - resolution_vertical=1080, - x=1920, - y=1080, - width=1920, - height=1080, - is_primary=True, - pixel_clock=60.0, - refresh_rate=60.0, - ) - ] + displays = FIXTURE_DISPLAYS assert isinstance(displays, list) assert isinstance(displays[0], Display) assert displays[0].id == "abc123" diff --git a/tests/modules/test_gpus.py b/tests/modules/test_gpus.py index 52deb5a..78446e8 100644 --- a/tests/modules/test_gpus.py +++ b/tests/modules/test_gpus.py @@ -1,26 +1,12 @@ -"""Test the gpus model.""" +"""Test the gpus module model.""" +from systembridgemodels.fixtures.modules.gpus import FIXTURE_GPUS from systembridgemodels.modules.gpus import GPU def test_gpus(): """Test the GPUs model.""" - gpus = [ - GPU( - id="abc123", - name="name", - core_clock=1000.0, - core_load=100.0, - fan_speed=100.0, - memory_clock=1000.0, - memory_load=100.0, - memory_free=1000.0, - memory_used=1000.0, - memory_total=1000.0, - power_usage=100.0, - temperature=100.0, - ) - ] + gpus = FIXTURE_GPUS assert isinstance(gpus, list) assert isinstance(gpus[0], GPU) assert gpus[0].id == "abc123" diff --git a/tests/modules/test_media.py b/tests/modules/test_media.py index 6dd5937..5594526 100644 --- a/tests/modules/test_media.py +++ b/tests/modules/test_media.py @@ -1,34 +1,12 @@ -"""Test the media model.""" +"""Test the media module model.""" +from systembridgemodels.fixtures.modules.media import FIXTURE_MEDIA from systembridgemodels.modules.media import Media def test_media(): """Test the media model.""" - media = Media( - album_artist="Album Artist", - album_title="Album Title", - artist="Artist", - duration=100, - is_fast_forward_enabled=True, - is_next_enabled=True, - is_pause_enabled=True, - is_play_enabled=True, - is_previous_enabled=True, - is_rewind_enabled=True, - is_stop_enabled=True, - playback_rate=1.0, - position=100, - repeat="repeat", - shuffle=True, - status="status", - subtitle="subtitle", - thumbnail="thumbnail", - title="title", - track_number=1, - type="type", - updated_at=100, - ) + media = FIXTURE_MEDIA assert isinstance(media, Media) assert media.album_artist == "Album Artist" assert media.album_title == "Album Title" diff --git a/tests/modules/test_memory.py b/tests/modules/test_memory.py index 050d9b9..17999e7 100644 --- a/tests/modules/test_memory.py +++ b/tests/modules/test_memory.py @@ -1,35 +1,12 @@ -"""Test the memory model.""" +"""Test the memory module model.""" from dataclasses import asdict +from systembridgemodels.fixtures.modules.memory import FIXTURE_MEMORY from systembridgemodels.modules.memory import Memory, MemorySwap, MemoryVirtual -model = Memory( - swap=MemorySwap( - total=1000, - used=500, - free=500, - percent=50.0, - sin=100, - sout=100, - ), - virtual=MemoryVirtual( - total=1000, - available=500, - percent=50.0, - used=500, - free=500, - active=500, - inactive=500, - buffers=500, - cached=500, - wired=500, - shared=500, - ), -) - -def test_memory(memory: Memory = model): +def test_memory(memory: Memory = FIXTURE_MEMORY): """Test the memory model.""" assert isinstance(memory, Memory) assert isinstance(memory.swap, MemorySwap) @@ -55,7 +32,7 @@ def test_memory(memory: Memory = model): def test_memory_dict(): """Test memory dict.""" - memory_dict = asdict(model) + memory_dict = asdict(FIXTURE_MEMORY) assert isinstance(memory_dict, dict) assert isinstance(memory_dict["swap"], dict) assert memory_dict["swap"]["total"] == 1000 diff --git a/tests/modules/test_networks.py b/tests/modules/test_networks.py index 9b152fd..660aa8a 100644 --- a/tests/modules/test_networks.py +++ b/tests/modules/test_networks.py @@ -1,5 +1,6 @@ -"""Test the networks model.""" +"""Test the networks module model.""" +from systembridgemodels.fixtures.modules.networks import FIXTURE_NETWORKS from systembridgemodels.modules.networks import ( Network, NetworkAddress, @@ -12,52 +13,7 @@ def test_networks(): """Test the networks model.""" - networks = Networks( - connections=[ - NetworkConnection( - fd=1, - family=2, - type=3, - laddr="laddr", - raddr="raddr", - status="status", - pid=4, - ) - ], - io=NetworkIO( - bytes_sent=1, - bytes_recv=2, - packets_sent=3, - packets_recv=4, - errin=5, - errout=6, - dropin=7, - dropout=8, - ), - networks=[ - Network( - name="name", - addresses=[ - NetworkAddress( - address="address", - netmask="netmask", - broadcast="broadcast", - ptp="ptp", - ) - ], - stats=NetworkStats( - isup=True, - duplex="duplex", - speed=1, - mtu=2, - flags=[ - "flag1", - "flag2", - ], - ), - ) - ], - ) + networks = FIXTURE_NETWORKS assert isinstance(networks, Networks) assert isinstance(networks.connections, list) assert isinstance(networks.connections[0], NetworkConnection) diff --git a/tests/modules/test_processes.py b/tests/modules/test_processes.py index 83b0e92..3269131 100644 --- a/tests/modules/test_processes.py +++ b/tests/modules/test_processes.py @@ -1,23 +1,12 @@ -"""Test the networks model.""" +"""Test the networks module model.""" +from systembridgemodels.fixtures.modules.processes import FIXTURE_PROCESSES from systembridgemodels.modules.processes import Process def test_networks(): """Test the processes model.""" - processes = [ - Process( - id=1234, - name="name", - cpu_usage=12.3, - created=12.3, - memory_usage=12.3, - path="/path", - status="running", - username="username", - working_directory="/working/directory", - ) - ] + processes = FIXTURE_PROCESSES assert isinstance(processes, list) assert isinstance(processes[0], Process) assert processes[0].id == 1234 diff --git a/tests/modules/test_sensors.py b/tests/modules/test_sensors.py index 85ef9b8..438a60d 100644 --- a/tests/modules/test_sensors.py +++ b/tests/modules/test_sensors.py @@ -1,5 +1,6 @@ -"""Test the networks model.""" +"""Test the networks module model.""" +from systembridgemodels.fixtures.modules.sensors import FIXTURE_SENSORS from systembridgemodels.modules.sensors import ( Sensors, SensorsNVIDIA, @@ -15,97 +16,7 @@ def test_networks(): """Test the sensors model.""" - sensors = Sensors( - fans=None, - temperatures=None, - windows_sensors=SensorsWindows( - hardware=[ - SensorsWindowsHardware( - id="id", - name="name", - type="type", - subhardware=[ - SensorsWindowsHardware( - id="id", - name="name", - type="type", - subhardware=[], - sensors=[ - SensorsWindowsSensor( - id="id", - name="name", - type="type", - value=12.3, - ) - ], - ) - ], - sensors=[ - SensorsWindowsSensor( - id="id", - name="name", - type="type", - value=12.3, - ) - ], - ) - ], - nvidia=SensorsNVIDIA( - chipset=SensorsNVIDIAChipset( - id=1234, - name="name", - flags="flags", - vendor_id=1234, - vendor_name="Vendor Name", - ), - displays=[ - SensorsNVIDIADisplay( - id=1234, - name="name", - active=True, - available=True, - connected=True, - dynamic=True, - aspect_horizontal=16, - aspect_vertical=9, - brightness_current=90, - brightness_default=80, - brightness_max=100, - brightness_min=0, - color_depth="Color Depth", - connection_type="Connection Type", - pixel_clock=60, - refresh_rate=144, - resolution_horizontal=1920, - resolution_vertical=1080, - ) - ], - driver=SensorsNVIDIADriver( - branch_version="Branch Version", - interface_version="Interface Version", - version=1234, - ), - gpus=[ - SensorsNVIDIAGPU( - id=1234, - name="name", - bios_oem_revision=1234, - bios_revision=1234, - bios_version="bios_version", - current_fan_speed_level=1234, - current_fan_speed_rpm=1234, - driver_model=1234, - memory_available=1234, - memory_capacity=1234, - memory_maker="Memory Maker", - serial="abc123", - system_type="System Type", - type="Type", - ) - ], - ), - ), - ) + sensors = FIXTURE_SENSORS assert isinstance(sensors, Sensors) assert sensors.fans is None diff --git a/tests/modules/test_system.py b/tests/modules/test_system.py index 5031b76..2fcfcea 100644 --- a/tests/modules/test_system.py +++ b/tests/modules/test_system.py @@ -1,40 +1,12 @@ -"""Test the networks model.""" +"""Test the networks module model.""" +from systembridgemodels.fixtures.modules.system import FIXTURE_SYSTEM from systembridgemodels.modules.system import System, SystemUser def test_networks(): """Test the system model.""" - system = System( - boot_time=1234, - fqdn="hostname.local", - hostname="hostname", - ip_address_4="192.168.1.100", - mac_address="00:00:00:00:00:00", - platform_version="1.0.0", - platform="platform", - uptime=1234, - users=[ - SystemUser( - name="username", - active=True, - terminal="terminal", - host="host", - started=1234, - pid=1234, - ) - ], - uuid="uuid", - version="1.0.0", - camera_usage=[ - "camera1", - "camera2", - ], - ip_address_6="::1", - pending_reboot=True, - version_latest="4.99.0", - version_newer_available=True, - ) + system = FIXTURE_SYSTEM assert isinstance(system, System) assert system.boot_time == 1234 assert system.fqdn == "hostname.local"