testcases: introduce get_exported_shares() helper function

Avoid directly accessing the test_info dict and use helper function
instead. This will allow us to modify the test_info.yml with minimal
disruption.

Signed-off-by: Sachin Prabhu <[email protected]>

Author: spuiuk

testcases/consistency/test_consistency.py

@@ -61,9 +61,9 @@ def generate_consistency_check(
     if not test_info_file:
         return []
     arr = []
-    for ipaddr in test_info_file["public_interfaces"]:
-        for share_name in test_info_file["exported_sharenames"]:
-            arr.append((ipaddr, share_name))
+    for share in testhelper.get_exported_shares(test_info):
+        s = testhelper.get_share(test_info, share)
+        arr.append((s["server"], s["name"]))
     return arr
 
 

testcases/containers/test_containers.py

@@ -66,12 +66,11 @@ def containers_check(ipaddr: str, share_name: str, test: str) -> None:
 
 
 def generate_containers_test() -> typing.List[typing.Tuple[str, str, str]]:
-    # Use the first given public_interface for our tests
-    ipaddr = test_info["public_interfaces"][0]
     arr = []
-    for share_name in test_info["exported_sharenames"]:
+    for share_name in testhelper.get_exported_shares(test_info):
+        server = testhelper.get_share(test_info, share_name)["server"]
         for test in container_tests.keys():
-            arr.append((ipaddr, share_name, test))
+            arr.append((server, share_name, test))
     return arr
 
 

testcases/misc/conftest.py

@@ -46,12 +46,12 @@ def setup_mount(
 
 
 def gen_params() -> typing.List[typing.Any]:
-    ipaddr = test_info["public_interfaces"][0]
-    exported_sharenames = test_info.get("exported_sharenames", [])
+    exported_sharenames = testhelper.get_exported_shares(test_info)
     arr = []
     for share_name in exported_sharenames:
+        server = testhelper.get_share(test_info, share_name)["server"]
         arr.append(
-            pytest.param((ipaddr, share_name), id=f"{ipaddr}-{share_name}")
+            pytest.param((server, share_name), id=f"{server}-{share_name}")
         )
     return arr
 

testcases/smbtorture/test_smbtorture.py

@@ -114,7 +114,7 @@ def list_smbtorture_tests():
 def generate_smbtorture_tests() -> typing.List[typing.Tuple[str, str]]:
     smbtorture_info = list_smbtorture_tests()
     arr = []
-    for share_name in test_info.get("exported_sharenames", []):
+    for share_name in testhelper.get_exported_shares(test_info):
         for torture_test in smbtorture_info:
             arr.append((share_name, torture_test))
     return arr

testhelper/testhelper.py

@@ -87,3 +87,14 @@ def get_premounted_shares(test_info: dict) -> typing.List[Path]:
     """
     premounted_shares = test_info.get("premounted_shares", [])
     return [Path(mnt) for mnt in premounted_shares]
+
+
+def get_exported_shares(test_info: dict) -> typing.List[str]:
+    """Get the list of exported shares
+
+    Parameters:
+    test_info: Dict containing the parsed yaml file.
+    Returns:
+    list of exported shares
+    """
+    return test_info.get("exported_sharenames", [])