From 6ad105936b39c1ed9d4dbf9182188d4caa7c9680 Mon Sep 17 00:00:00 2001
From: ahmedk <karim.ahmed@xfel.eu>
Date: Wed, 5 Jul 2023 15:06:03 +0200
Subject: [PATCH] Catch errors for no-cluster-job calibrations
---
tests/test_reference_runs/callab_tests.py | 30 +++++++++----------
.../test_pre_deployment.py | 7 +++--
2 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/tests/test_reference_runs/callab_tests.py b/tests/test_reference_runs/callab_tests.py
index b5bfc78ab..12bbc9f6b 100644
--- a/tests/test_reference_runs/callab_tests.py
+++ b/tests/test_reference_runs/callab_tests.py
@@ -467,21 +467,21 @@ automated_test_config = {
},
"reference-folder": "{}/{}/{}",
},
- "MID_EXP_EPIX-2-CORRECT": {
- "det_type": "EPIX100",
- "cal_type": "CORRECT",
- "config": {
- "out-folder": "{}/{}/{}",
- # "/gpfs/exfel/exp/HED/202102/p002656/raw"
- "in-folder": "/gpfs/exfel/exp/CALLAB/202130/p900203/raw",
- "run": "9038", # Original run: "230"
- "karabo-id": "MID_EXP_EPIX-2",
- "karabo-da": "EPIX01",
- "sequences": "1,2,3",
- "fix-temperature": 290,
- },
- "reference-folder": "{}/{}/{}",
- },
+ # "MID_EXP_EPIX-1-CORRECT": {
+ # "det_type": "EPIX100",
+ # "cal_type": "CORRECT",
+ # "config": {
+ # "out-folder": "{}/{}/{}",
+ # # Original proposal 2936
+ # "in-folder": "/gpfs/exfel/exp/CALLAB/202130/p900203/raw",
+ # "run": "9042", # Original run: "160"
+ # "karabo-id": "MID_EXP_EPIX-1",
+ # "karabo-da": "EPIX01",
+ # "sequences": "1,2,3",
+ # "fix-temperature": 290,
+ # },
+ # "reference-folder": "{}/{}/{}",
+ # },
"HED_IA1_EPX100-1-CORRECT": {
"det_type": "EPIX100",
"cal_type": "CORRECT",
diff --git a/tests/test_reference_runs/test_pre_deployment.py b/tests/test_reference_runs/test_pre_deployment.py
index 32ea35f13..d9e05e59c 100644
--- a/tests/test_reference_runs/test_pre_deployment.py
+++ b/tests/test_reference_runs/test_pre_deployment.py
@@ -450,7 +450,7 @@ def test_xfel_calibrate(
reference_dir_base, cal_conf["karabo-id"], test_key))
report_name = (
- reference_folder /
+ out_folder /
f"{test_key}_{datetime.now().strftime('%y%m%d_%H%M%S')}")
cal_conf["report-to"] = str(report_name)
@@ -474,11 +474,14 @@ def test_xfel_calibrate(
f = io.StringIO()
LOGGER.info(f"Submitting CL: {cmd}")
with redirect_stdout(f):
- calibrate.run(cmd)
+ errors = calibrate.run(cmd)
out_str = f.getvalue()
if use_slurm:
slurm_watcher(test_key, out_str)
+ else:
+ # confirm that all jobs succeeded.
+ assert errors == 0
# 2nd check for report availability.
report_file = out_folder / f"{report_name}.pdf"
--
GitLab