From f9c00f3e4b4ab0746b6aeed6cf61ef985a35591d Mon Sep 17 00:00:00 2001
From: Thomas Kluyver <thomas@kluyver.me.uk>
Date: Thu, 19 Aug 2021 16:04:03 +0100
Subject: [PATCH] Fix user venv test
---
src/xfel_calibrate/calibrate.py | 1 +
tests/test_xfel_calibrate/test_user_configs.py | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/xfel_calibrate/calibrate.py b/src/xfel_calibrate/calibrate.py
index 283e39dfc..1dd810b12 100755
--- a/src/xfel_calibrate/calibrate.py
+++ b/src/xfel_calibrate/calibrate.py
@@ -1037,6 +1037,7 @@ def run():
user_venv = nb_info.get("user", {}).get("venv")
if user_venv:
user_venv = Path(user_venv.format(**args))
+ print("Using specified venv:", user_venv)
python_exe = str(user_venv / 'bin' / 'python')
else:
python_exe = python_path
diff --git a/tests/test_xfel_calibrate/test_user_configs.py b/tests/test_xfel_calibrate/test_user_configs.py
index e064ca731..21feb55a9 100644
--- a/tests/test_xfel_calibrate/test_user_configs.py
+++ b/tests/test_xfel_calibrate/test_user_configs.py
@@ -122,7 +122,7 @@ class TestUserVenv:
)
def test_call(self, calibrate_call: CalibrateCall):
- assert "Running job in user venv at" in calibrate_call.out
+ assert "specified venv" in calibrate_call.out
def test_expected_processes_called(
self,
--
GitLab