From 270a420455b362d815fedd0ab00693d97c10abc7 Mon Sep 17 00:00:00 2001 From: Elliot Oram <elliot.oram@stfc.ac.uk> Date: Tue, 21 Nov 2017 11:57:18 +0000 Subject: [PATCH] Make tests use correct comparison method Refs #21229 --- Testing/SystemTests/tests/analysis/ISIS_PowderGemTest.py | 2 +- Testing/SystemTests/tests/analysis/ISIS_PowderHRPDTest.py | 2 +- Testing/SystemTests/tests/analysis/ISIS_PowderPearlTest.py | 2 +- Testing/SystemTests/tests/analysis/ISIS_PowderPolarisTest.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Testing/SystemTests/tests/analysis/ISIS_PowderGemTest.py b/Testing/SystemTests/tests/analysis/ISIS_PowderGemTest.py index 3219963e0ff..af1a8ccc5aa 100644 --- a/Testing/SystemTests/tests/analysis/ISIS_PowderGemTest.py +++ b/Testing/SystemTests/tests/analysis/ISIS_PowderGemTest.py @@ -148,7 +148,7 @@ def _compare_ws(reference_file_name, results): is_valid = True if len(results) > 0 else False for ws, ref in zip(results, ref_ws): - if not (mantid.CompareWorkspaces(Workspace1=ws, Workspace2=ref)): + if not (mantid.CompareWorkspaces(Workspace1=ws, Workspace2=ref)[0]): is_valid = False print (ws.getName() + " was not equal to: " + ref.getName()) diff --git a/Testing/SystemTests/tests/analysis/ISIS_PowderHRPDTest.py b/Testing/SystemTests/tests/analysis/ISIS_PowderHRPDTest.py index 6977b7d3b2e..4e50cf3caa2 100644 --- a/Testing/SystemTests/tests/analysis/ISIS_PowderHRPDTest.py +++ b/Testing/SystemTests/tests/analysis/ISIS_PowderHRPDTest.py @@ -94,7 +94,7 @@ def _compare_ws(reference_file_name, results): is_valid = len(results) > 0 for (ws, ref) in zip(results, ref_ws): - if not mantid.CompareWorkspaces(Workspace1=ws, Workspace2=ref): + if not (mantid.CompareWorkspaces(Workspace1=ws, Workspace2=ref)[0]): is_valid = False print("{} was not equal to {}".format(ws.getName(), ref.getName())) diff --git a/Testing/SystemTests/tests/analysis/ISIS_PowderPearlTest.py b/Testing/SystemTests/tests/analysis/ISIS_PowderPearlTest.py index 1b3731a5357..3fc17b20035 100644 --- a/Testing/SystemTests/tests/analysis/ISIS_PowderPearlTest.py +++ b/Testing/SystemTests/tests/analysis/ISIS_PowderPearlTest.py @@ -203,7 +203,7 @@ def _compare_ws(reference_file_name, results): is_valid = len(results) > 0 - if not (mantid.CompareWorkspaces(Workspace1=results, Workspace2=ref_ws)): + if not (mantid.CompareWorkspaces(Workspace1=results, Workspace2=ref_ws)[0]): is_valid = False print(results.getName() + " was not equal to: " + ref_ws.getName()) diff --git a/Testing/SystemTests/tests/analysis/ISIS_PowderPolarisTest.py b/Testing/SystemTests/tests/analysis/ISIS_PowderPolarisTest.py index 963075d6e66..0d921c8d481 100644 --- a/Testing/SystemTests/tests/analysis/ISIS_PowderPolarisTest.py +++ b/Testing/SystemTests/tests/analysis/ISIS_PowderPolarisTest.py @@ -154,7 +154,7 @@ def _compare_ws(reference_file_name, results): is_valid = len(results) > 0 for ws, ref in zip(results, ref_ws): - if not (mantid.CompareWorkspaces(Workspace1=ws, Workspace2=ref)): + if not (mantid.CompareWorkspaces(Workspace1=ws, Workspace2=ref)[0]): is_valid = False print (ws.getName() + " was not equal to: " + ref.getName()) -- GitLab