From 1074204af80761130501a0a544aa59e329d93ff7 Mon Sep 17 00:00:00 2001 From: James Beilsten-Edmands <30625594+jbeilstenedmands@users.noreply.github.com> Date: Thu, 17 Oct 2024 09:50:10 +0100 Subject: [PATCH] Update tests --- tests/regression/test_cluster_analysis.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tests/regression/test_cluster_analysis.py b/tests/regression/test_cluster_analysis.py index 2d5d759d8..b9104141f 100644 --- a/tests/regression/test_cluster_analysis.py +++ b/tests/regression/test_cluster_analysis.py @@ -156,7 +156,10 @@ def test_rotation_data(dials_data, run_in_tmp_path): ] result = subprocess.run(args_clustering, capture_output=True) assert not result.returncode and not result.stderr - check_output(run_in_tmp_path) + assert (run_in_tmp_path / "xia2.cluster_analysis.json").is_file() + assert (run_in_tmp_path / "xia2.cluster_analysis.log").is_file() + assert (run_in_tmp_path / "xia2.cluster_analysis.html").is_file() + assert (run_in_tmp_path / "cc_clusters" / "cluster_2").exists() def check_output(main_dir, output_clusters=True, interesting_clusters=False): @@ -164,8 +167,8 @@ def check_output(main_dir, output_clusters=True, interesting_clusters=False): assert (main_dir / "cc_clusters" / "cluster_2").exists() assert (main_dir / "cos_angle_clusters" / "cluster_2").exists() if output_clusters and interesting_clusters: - assert (main_dir / "cc_clusters" / "cluster_3").exists() - assert (main_dir / "cos_angle_clusters" / "cluster_3").exists() + assert (main_dir / "cc_clusters" / "cluster_2").exists() + assert (main_dir / "cos_angle_clusters" / "cluster_2").exists() assert (main_dir / "xia2.cluster_analysis.json").is_file() assert (main_dir / "xia2.cluster_analysis.log").is_file() assert (main_dir / "xia2.cluster_analysis.html").is_file()