shepherd-core 2023.10.3__py3-none-any.whl → 2023.12.1__py3-none-any.whl

tests/fw_tools/test_patcher.py

@@ -8,21 +8,24 @@ from shepherd_core import fw_tools
 from .conftest import files_elf
 
 
+@pytest.mark.elf
 @pytest.mark.parametrize("path_elf", files_elf)
 def test_sym_finding(path_elf: Path) -> None:
     assert fw_tools.find_symbol(path_elf, "SHEPHERD_NODE_ID")
 
 
+@pytest.mark.elf
 @pytest.mark.parametrize("path_elf", files_elf)
 def test_sym_reading(path_elf: Path) -> None:
     assert fw_tools.read_symbol(path_elf, "SHEPHERD_NODE_ID")
 
 
+@pytest.mark.elf
 @pytest.mark.parametrize("path_elf", files_elf)
 def test_sym_mod(path_elf: Path, tmp_path: Path) -> None:
     value = 0xCAFE
     sym = "SHEPHERD_NODE_ID"
-    path_new = tmp_path.with_name(path_elf.name).resolve()
+    path_new = tmp_path / path_elf.name
     shutil.copy(path_elf, path_new)
     path_gen = fw_tools.modify_symbol_value(path_new, sym, value, overwrite=False)
     assert path_gen.is_file()
@@ -33,13 +36,16 @@ def test_sym_mod(path_elf: Path, tmp_path: Path) -> None:
     assert value_new != value_old
 
 
+@pytest.mark.elf
 @pytest.mark.parametrize("path_elf", files_elf)
 def test_sym_mod_overwrite(path_elf: Path, tmp_path: Path) -> None:
     value = 0xCAFE
     sym = "SHEPHERD_NODE_ID"
-    path_new = tmp_path.with_name(path_elf.name).resolve()
+    path_new = tmp_path / path_elf.name
     shutil.copy(path_elf, path_new)
-    path_gen = fw_tools.modify_symbol_value(path_new, sym, value, overwrite=True)
+    path_gen = fw_tools.modify_symbol_value(
+        path_new, sym, value, overwrite=True
+    )  # TODO: WinOS-trouble
     assert path_gen.is_file()
     assert path_gen.as_posix() == path_new.as_posix()
     value_new = fw_tools.read_symbol(path_gen, sym)
@@ -48,10 +54,11 @@ def test_sym_mod_overwrite(path_elf: Path, tmp_path: Path) -> None:
     assert value_new != value_old
 
 
+@pytest.mark.elf
 @pytest.mark.parametrize("path_elf", files_elf)
 def test_id_mod(path_elf: Path, tmp_path: Path) -> None:
     value = 0xCAFE
-    path_new = tmp_path.with_name(path_elf.name).resolve()
+    path_new = tmp_path / path_elf.name
     shutil.copy(path_elf, path_new)
     path_gen = fw_tools.modify_uid(path_new, value)
     assert path_gen.as_posix() == path_new.as_posix()

tests/fw_tools/test_validation.py

@@ -8,6 +8,8 @@ from shepherd_core.data_models import FirmwareDType
 from .conftest import files_elf
 
 
+@pytest.mark.elf
+@pytest.mark.converter
 @pytest.mark.parametrize("path_elf", files_elf)
 def test_elf_detection(path_elf: Path) -> None:
     assert fw_tools.is_elf(path_elf)
@@ -17,6 +19,8 @@ def test_elf_detection(path_elf: Path) -> None:
         assert fw_tools.is_elf_msp430(path_elf)
 
 
+@pytest.mark.elf
+@pytest.mark.converter
 @pytest.mark.parametrize("path_elf", files_elf)
 def test_elf_determination(path_elf: Path) -> None:
     assert fw_tools.determine_type(path_elf) == FirmwareDType.path_elf
@@ -26,6 +30,8 @@ def test_elf_determination(path_elf: Path) -> None:
         assert fw_tools.determine_arch(path_elf) == "msp430"
 
 
+@pytest.mark.elf
+@pytest.mark.converter
 @pytest.mark.parametrize("path_elf", files_elf)
 def test_hex_detection(path_elf: Path, tmp_path: Path) -> None:
     path_hex = (tmp_path / (path_elf.stem + ".hex")).resolve()
@@ -37,6 +43,8 @@ def test_hex_detection(path_elf: Path, tmp_path: Path) -> None:
         assert fw_tools.is_hex_msp430(path_hex)
 
 
+@pytest.mark.elf
+@pytest.mark.converter
 @pytest.mark.parametrize("path_elf", files_elf)
 def test_hex_determination(path_elf: Path, tmp_path: Path) -> None:
     path_hex = (tmp_path / (path_elf.stem + ".hex")).resolve()

tests/inventory/test_inventory.py

@@ -9,9 +9,7 @@ from shepherd_core.inventory import SystemInventory
 from shepherd_core.inventory import TargetInventory
 
 
-@pytest.mark.parametrize(
-    "inv", [PythonInventory, SystemInventory, TargetInventory, Inventory]
-)
+@pytest.mark.parametrize("inv", [PythonInventory, SystemInventory, TargetInventory, Inventory])
 def test_collect_data(inv: Inventory) -> None:
     inv.collect()
 

tests/test_cal_hw.py

@@ -10,9 +10,7 @@ from shepherd_core.calibration_hw_def import dac_raw_to_voltage
 from shepherd_core.calibration_hw_def import dac_voltage_to_raw
 
 
-@pytest.mark.parametrize(
-    "fn", [adc_current_to_raw, adc_voltage_to_raw, dac_voltage_to_raw]
-)
+@pytest.mark.parametrize("fn", [adc_current_to_raw, adc_voltage_to_raw, dac_voltage_to_raw])
 def test_convert_to_raw(fn: Callable) -> None:
     values = [-1, -1e-6, 1e-6, 1e-5, 1e-4, 1e-3, 1e-2, 1e-1, 1e-0]
     value_prev = -1
@@ -24,9 +22,7 @@ def test_convert_to_raw(fn: Callable) -> None:
         value_prev = value_raw
 
 
-@pytest.mark.parametrize(
-    "fn", [adc_raw_to_current, adc_raw_to_voltage, dac_raw_to_voltage]
-)
+@pytest.mark.parametrize("fn", [adc_raw_to_current, adc_raw_to_voltage, dac_raw_to_voltage])
 def test_convert_to_si(fn: Callable) -> None:
     values = [-100, -1, 0, 1, 2**6, 2**12, 2**18, 2**24]
     value_prev = -1

tests/test_examples.py

@@ -15,8 +15,6 @@ def example_path() -> Path:
 examples = [
     "experiment_generic_var1.py",
     "experiment_models.py",
-    "firmware_model.py",
-    "firmware_modification.py",
     "inventory.py",
     "uart_decode_waveform.py",
     "vharvester_simulation.py",
@@ -27,3 +25,16 @@ examples = [
 @pytest.mark.parametrize("file", examples)
 def test_example_scripts(example_path: Path, file: str) -> None:
     subprocess.check_call(f"python {example_path / file}", shell=True)
+
+
+examples_fw = [
+    "firmware_model.py",
+    "firmware_modification.py",
+]
+
+
+@pytest.mark.converter
+@pytest.mark.elf
+@pytest.mark.parametrize("file", examples_fw)
+def test_example_scripts_fw(example_path: Path, file: str) -> None:
+    subprocess.check_call(f"python {example_path / file}", shell=True)

tests/test_writer.py

@@ -140,7 +140,7 @@ def test_writer_align(h5_path: Path) -> None:
         data_nd = np.zeros((int(length),))
         sfw.append_iv_data_raw(time_nd, data_nd, data_nd)
     with Reader(h5_path) as sfr:
-        assert sfr.ds_time.size < length
+        assert sfr.ds_voltage.size < length
 
 
 def test_writer_not_align(h5_path: Path) -> None:
@@ -151,7 +151,7 @@ def test_writer_not_align(h5_path: Path) -> None:
         data_nd = np.zeros((int(length),))
         sfw.append_iv_data_raw(time_nd, data_nd, data_nd)
     with Reader(h5_path) as sfr:
-        assert sfr.ds_time.size == length
+        assert sfr.ds_voltage.size == length
 
 
 def test_writer_setter(h5_path: Path) -> None:

tests/vsource/conftest.py

@@ -9,9 +9,7 @@ from shepherd_data import mppt
 
 @pytest.fixture
 def file_ivonne() -> Path:
-    path = (
-        Path(__file__).resolve().parent.parent.parent.parent / "shepherd_data/examples"
-    )
+    path = Path(__file__).resolve().parent.parent.parent.parent / "shepherd_data/examples"
     os.chdir(path)
     return path / "./jogging_10m.iv"
 

tests/vsource/test_converter.py

@@ -146,9 +146,7 @@ def test_vsource_vsrc_sim_curve(src_name: str, file_ivcurve: Path) -> None:
         for _t, _v, _i in file.read_buffers():
             length = max(_v.size, _i.size)
             for _n in range(length):
-                src.iterate_sampling(
-                    V_inp_uV=_v[_n] * 10**6, I_inp_nA=_i[_n] * 10**9
-                )
+                src.iterate_sampling(V_inp_uV=_v[_n] * 10**6, I_inp_nA=_i[_n] * 10**9)
 
 
 @pytest.mark.parametrize("src_name", src_list)
@@ -160,6 +158,4 @@ def test_vsource_vsrc_sim_sample(src_name: str, file_ivsample: Path) -> None:
         for _t, _v, _i in file.read_buffers():
             length = max(_v.size, _i.size)
             for _n in range(length):
-                src.iterate_sampling(
-                    V_inp_uV=_v[_n] * 10**6, I_inp_nA=_i[_n] * 10**9
-                )
+                src.iterate_sampling(V_inp_uV=_v[_n] * 10**6, I_inp_nA=_i[_n] * 10**9)

tests/vsource/test_harvester.py

@@ -39,9 +39,7 @@ def test_vsource_hrv_fail_ivcurve(hrv_name: str) -> None:
     # the first algos are not usable for ivcurve
     with pytest.raises(ValueError):
         hrv_config = VirtualHarvesterConfig(name=hrv_name)
-        _ = HarvesterPRUConfig.from_vhrv(
-            hrv_config, for_emu=True, dtype_in=EnergyDType.ivcurve
-        )
+        _ = HarvesterPRUConfig.from_vhrv(hrv_config, for_emu=True, dtype_in=EnergyDType.ivcurve)
 
 
 @pytest.mark.parametrize("hrv_name", hrv_list[3:])
@@ -58,9 +56,7 @@ def test_vsource_hrv_sim(hrv_name: str, file_ivcurve: Path) -> None:
         for _t, _v, _i in file.read_buffers():
             length = max(_v.size, _i.size)
             for _n in range(length):
-                hrv.ivcurve_sample(
-                    _voltage_uV=_v[_n] * 10**6, _current_nA=_i[_n] * 10**9
-                )
+                hrv.ivcurve_sample(_voltage_uV=_v[_n] * 10**6, _current_nA=_i[_n] * 10**9)
 
 
 @pytest.mark.parametrize("hrv_name", hrv_list[3:])
@@ -68,9 +64,7 @@ def test_vsource_hrv_fail_isc_voc(hrv_name: str) -> None:
     # not implemented ATM
     with pytest.raises(ValueError):
         hrv_config = VirtualHarvesterConfig(name=hrv_name)
-        _ = HarvesterPRUConfig.from_vhrv(
-            hrv_config, for_emu=True, dtype_in=EnergyDType.isc_voc
-        )
+        _ = HarvesterPRUConfig.from_vhrv(hrv_config, for_emu=True, dtype_in=EnergyDType.isc_voc)
 
 
 def test_vsource_hrv_fail_unknown_type() -> None: