Fix import paths in analysis system tests

mantidproject · Jul 23, 2024 · 5ca9dff · 5ca9dff
1 parent f9c1791
commit 5ca9dff
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/tests/system/analysis/test_analysis.py b/tests/system/analysis/test_analysis.py
@@ -15,7 +15,7 @@
 import mvesuvio
 mvesuvio.set_config(
     ip_folder=str(Path(handle_config.VESUVIO_PACKAGE_PATH).joinpath("config", "ip_files")),
-    inputs_file=str(Path(__file__).absolute().parent.parent / "data" / "inputs" / "sample_test.py")
+    inputs_file=str(Path(__file__).absolute().parent.parent.parent / "data" / "analysis" / "inputs" / "sample_test.py")
 )
 ipFilesPath = Path(handle_config.read_config_var("caching.ipfolder"))
 
@@ -58,7 +58,7 @@ def _run(cls):
 
     @classmethod
     def _load_benchmark_results(cls):
-        benchmarkPath = Path(__file__).absolute().parent.parent / "data" / "benchmark"
+        benchmarkPath = Path(__file__).absolute().parent.parent.parent / "data" / "analysis" / "benchmark"
         benchmarkResults = np.load(
             str(benchmarkPath / "stored_spec_144-182_iter_3_GC_MS.npz")
         )

diff --git a/tests/system/analysis/test_yspace_fit.py b/tests/system/analysis/test_yspace_fit.py
@@ -16,7 +16,7 @@
 import mvesuvio
 mvesuvio.set_config(
     ip_folder=str(Path(handle_config.VESUVIO_PACKAGE_PATH).joinpath("config", "ip_files")),
-    inputs_file=str(Path(__file__).absolute().parent.parent / "data" / "inputs" / "sample_test.py")
+    inputs_file=str(Path(__file__).absolute().parent.parent.parent / "data" / "analysis" / "inputs" / "sample_test.py")
 )
 np.set_printoptions(suppress=True, precision=8, linewidth=150)
 
@@ -45,8 +45,8 @@ class UserScriptControls:
 class AnalysisRunner:
     _benchmarkResults = None
     _currentResults = None
-    _input_data_path = Path(__file__).absolute().parent.parent / "data" / "inputs"
-    _benchmark_path = Path(__file__).absolute().parent.parent / "data" / "benchmark"
+    _input_data_path = Path(__file__).absolute().parent.parent.parent / "data" / "analysis" / "inputs"
+    _benchmark_path = Path(__file__).absolute().parent.parent.parent / "data" / "analysis" / "benchmark"
     _workspaces_loaded = False
 
     @classmethod

diff --git a/tests/system/analysis/test_yspace_fit_GC.py b/tests/system/analysis/test_yspace_fit_GC.py
@@ -16,7 +16,7 @@
 import mvesuvio
 mvesuvio.set_config(
     ip_folder=str(Path(handle_config.VESUVIO_PACKAGE_PATH).joinpath("config", "ip_files")),
-    inputs_file=str(Path(__file__).absolute().parent.parent / "data" / "inputs" / "sample_test.py")
+    inputs_file=str(Path(__file__).absolute().parent.parent.parent / "data" / "analysis" / "inputs" / "sample_test.py")
 )
 np.set_printoptions(suppress=True, precision=8, linewidth=150)
 
@@ -46,8 +46,8 @@ class UserScriptControls:
 class AnalysisRunner:
     _benchmarkResults = None
     _currentResults = None
-    _input_data_path = Path(__file__).absolute().parent.parent / "data" / "inputs"
-    _benchmark_path = Path(__file__).absolute().parent.parent / "data" / "benchmark"
+    _input_data_path = Path(__file__).absolute().parent.parent.parent / "data" / "analysis" / "inputs"
+    _benchmark_path = Path(__file__).absolute().parent.parent.parent / "data" / "analysis" / "benchmark"
     _workspaces_loaded = False
 
     @classmethod