Fix tests after API changes

Internal-tag: [#52180]
Signed-off-by: Rafal Kolucki <[email protected]>

tests/data/data_build/design.yaml

@@ -3,10 +3,10 @@
 
 ips:
   dma:
-    file: tests/data/data_build/DMATop.yaml
+    file: DMATop.yaml
     module: DMATop
   disp:
-    file: tests/data/data_build/axi_dispctrl_v1_0.yaml
+    file: axi_dispctrl_v1_0.yaml
     module: axi_dispctrl_v1_0
 
 design:

tests/data/data_build/hierarchy/design.yml

@@ -3,10 +3,10 @@
 
 ips:
   pwm:
-    file: tests/data/data_build/hierarchy/pwm.yml
+    file: pwm.yml
     module: pwm
   counter:
-    file: tests/data/data_build/hierarchy/counter.yml
+    file: counter.yml
     module: cnt
 
 # This design contains `pwm` module connected with `counter_hier`

tests/tests_build/test_hier_design.py

@@ -21,6 +21,11 @@ def hier_design_yaml() -> Path:
     return Path("tests/data/data_build/hierarchy/design.yml")
 
 
+@pytest.fixture
+def hier_design_path(hier_design_yaml) -> Path:
+    return Path(hier_design_yaml).resolve().parent
+
+
 @pytest.fixture
 def hier_design(hier_design_yaml) -> dict:
     with open(hier_design_yaml, "r") as f:
@@ -53,8 +58,10 @@ def counter_hier_conns() -> list:
 
 
 @pytest.fixture
-def hier_design_ipconnect(hier_design) -> IPConnect:
-    return generate_design(hier_design["ips"], hier_design["design"], hier_design["external"])
+def hier_design_ipconnect(hier_design, hier_design_path) -> IPConnect:
+    return generate_design(
+        hier_design["ips"], hier_design["design"], hier_design["external"], hier_design_path
+    )
 
 
 class TestHierarchyDesign:

tests/tests_build/test_ip_connect.py

@@ -27,25 +27,35 @@ def axi_dispctrl_name() -> str:
 
 @pytest.fixture
 def dmatop_yaml() -> Path:
-    return Path("tests/data/data_build/DMATop.yaml")
+    return Path("DMATop.yaml")
 
 
 @pytest.fixture
 def axi_dispctrl_yaml() -> Path:
-    return Path("tests/data/data_build/axi_dispctrl_v1_0.yaml")
+    return Path("axi_dispctrl_v1_0.yaml")
+
+
+@pytest.fixture
+def dmatop_path(dmatop_yaml) -> Path:
+    return Path("tests/data/data_build").resolve()
+
+
+@pytest.fixture
+def axi_dispctrl_path(axi_dispctrl_yaml) -> Path:
+    return Path("tests/data/data_build").resolve()
 
 
 # -------------------------------------
 # IPWrapper and hierarchy IPConnect structures
 # -------------------------------------
 @pytest.fixture
-def dmatop_ipw(dmatop_yaml, dmatop_name) -> IPWrapper:
-    return IPWrapper(dmatop_yaml, dmatop_name, dmatop_name)
+def dmatop_ipw(dmatop_yaml, dmatop_path, dmatop_name) -> IPWrapper:
+    return IPWrapper(dmatop_yaml, dmatop_path, dmatop_name, dmatop_name)
 
 
 @pytest.fixture
-def axi_dispctrl_ipw(axi_dispctrl_yaml, axi_dispctrl_name) -> IPWrapper:
-    return IPWrapper(axi_dispctrl_yaml, axi_dispctrl_name, axi_dispctrl_name)
+def axi_dispctrl_ipw(axi_dispctrl_yaml, axi_dispctrl_path, axi_dispctrl_name) -> IPWrapper:
+    return IPWrapper(axi_dispctrl_yaml, axi_dispctrl_path, axi_dispctrl_name, axi_dispctrl_name)
 
 
 # -------------------------------------

tests/tests_build/test_ip_wrapper.py

@@ -19,21 +19,29 @@ def axi_dispctrl_name() -> str:
 
 @pytest.fixture
 def axi_dispctrl_yaml() -> Path:
-    return Path("tests/data/data_build/axi_dispctrl_v1_0.yaml")
+    return Path("axi_dispctrl_v1_0.yaml")
+
+
+@pytest.fixture
+def axi_dispctrl_path(axi_dispctrl_yaml) -> Path:
+    return Path("tests/data/data_build")
 
 
 # -----------------
 # IPWrapper objects
 # -----------------
 @pytest.fixture
-def axi_dispctrl_ipw(axi_dispctrl_name, axi_dispctrl_yaml) -> IPWrapper:
-    return IPWrapper(axi_dispctrl_yaml, axi_dispctrl_name, axi_dispctrl_name, {})
+def axi_dispctrl_ipw(axi_dispctrl_name, axi_dispctrl_path, axi_dispctrl_yaml) -> IPWrapper:
+    return IPWrapper(axi_dispctrl_yaml, axi_dispctrl_path, axi_dispctrl_name, axi_dispctrl_name, {})
 
 
 @pytest.fixture
-def axi_dispctrl_ipw_overriden(axi_dispctrl_name, axi_dispctrl_yaml) -> IPWrapper:
+def axi_dispctrl_ipw_overriden(
+    axi_dispctrl_name, axi_dispctrl_path, axi_dispctrl_yaml
+) -> IPWrapper:
     return IPWrapper(
         axi_dispctrl_yaml,
+        axi_dispctrl_path,
         axi_dispctrl_name,
         axi_dispctrl_name,
         {"C_S_AXIS_TDATA_WIDTH": 64, "C_S00_AXI_DATA_WIDTH": 64},