From 03fa79698a198138202ef49791f5d2816391bd85 Mon Sep 17 00:00:00 2001
From: Thomas Kluyver <thomas@kluyver.me.uk>
Date: Thu, 19 Aug 2021 15:40:53 +0100
Subject: [PATCH] Fix tests
---
src/xfel_calibrate/calibrate.py | 2 ++
tests/test_xfel_calibrate/conftest.py | 4 ++++
tests/test_xfel_calibrate/test_cli.py | 4 ----
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/xfel_calibrate/calibrate.py b/src/xfel_calibrate/calibrate.py
index 7268d8701..a732b23b3 100755
--- a/src/xfel_calibrate/calibrate.py
+++ b/src/xfel_calibrate/calibrate.py
@@ -839,6 +839,8 @@ class JobGroup: # TODO: Naming - task? request? commission?
}, f, indent=2)
def submit_jobs(self, slurm_opts: SlurmOptions):
+ print("Submitting jobs with Slurm options:")
+ print(" ".join(slurm_opts.get_launcher_command(self.work_dir)))
all_job_ids = []
dep_job_ids = []
for step in self.steps:
diff --git a/tests/test_xfel_calibrate/conftest.py b/tests/test_xfel_calibrate/conftest.py
index 2920104b4..84765fe41 100644
--- a/tests/test_xfel_calibrate/conftest.py
+++ b/tests/test_xfel_calibrate/conftest.py
@@ -44,6 +44,10 @@ class FakeProcessCalibrate(FakeProcess):
self.register_subprocess(
["git", self.any(), "describe", "--tag"], stdout=["0.0.0"]
)
+ # For recording installed packages
+ self.register_subprocess(
+ [self.any(), '-m', 'pip', 'freeze'], stdout=["h5py==3.3.0"],
+ )
self.keep_last_process(True)
diff --git a/tests/test_xfel_calibrate/test_cli.py b/tests/test_xfel_calibrate/test_cli.py
index ed02de5e7..8eeae450e 100644
--- a/tests/test_xfel_calibrate/test_cli.py
+++ b/tests/test_xfel_calibrate/test_cli.py
@@ -160,7 +160,6 @@ class TestTutorialNotebook:
assert "sbatch" in calibrate_call.out
assert "--job-name xfel_calibrate" in calibrate_call.out
assert str(calibrate_call.tmp_path) in calibrate_call.out
- assert "Submitted job: " in calibrate_call.out
assert calibrate_call.err == ""
@@ -210,9 +209,6 @@ class TestTutorialNotebook:
expected_equals = {
"joblist": ["000000"],
- "project": "Tutorial Calculation",
- "calibration": "Tutorial Calculation",
- "author": "Astrid Muennich",
"version": "0.0.0",
"data_path": "",
}
--
GitLab