Skip to content

Commit 02fdbfe

Browse files
committed
fix up 2 failining unit tests
1 parent 9e9c8ba commit 02fdbfe

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

src/snapred/backend/data/GroceryService.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1520,8 +1520,8 @@ def combinePixelMasks(self, outputMaskWsName: WorkspaceName, masks2Combine: List
15201520
raise ValueError("Internal Error: Lists of masks to combine is empty")
15211521

15221522
if not self.mantidSnapper.mtd.doesExist(outputMaskWsName):
1523-
raise ValueError(("Internal Error: outputMaskWs should exist before attempting to combine masks with it."
1524-
"consider using fetchCompatiblePixelMask to generate it."))
1523+
raise ValueError(("Internal Error: outputMaskWs should exist before attempting to combine masks with it. "
1524+
"Consider using fetchCompatiblePixelMask to generate it."))
15251525

15261526
for maskWsName in masks2Combine:
15271527
if maskWsName == outputMaskWsName:

tests/unit/backend/service/test_CalibrationService.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -766,6 +766,8 @@ def test_fetchDiffractionCalibrationGroceries(self):
766766
}
767767
)
768768
self.instance.groceryService.fetchCompatiblePixelMask = mock.Mock(side_effect=lambda n, _, __: n)
769+
self.instance.groceryService.mantidSnapper.mtd.doesExist = mock.Mock(side_effect=lambda _: True)
770+
self.instance.groceryService.mantidSnapper.BinaryOperateMasks = mock.Mock()
769771
self.instance.validateRequest = mock.Mock()
770772

771773
request = mock.Mock(
@@ -805,7 +807,8 @@ def test_fetchDiffractionCalibrationGroceries(self):
805807
combinedMask,
806808
[calibrationMaskName, "mask1", "mask2", combinedMask],
807809
)
808-
810+
assert self.instance.groceryService.mantidSnapper.BinaryOperateMasks.called
811+
809812
@mock.patch(thisService + "SimpleDiffCalRequest", spec_set=SimpleDiffCalRequest)
810813
def test_diffractionCalibration_calls_others(self, SimpleDiffCalRequest):
811814
# mock out external functionalties
@@ -1101,6 +1104,8 @@ def test_diffractionCalibration_with_bad_masking(
11011104
self.instance.groceryService.fetchGroceryDict = mock.Mock(return_value={"maskWorkspace": self.sampleMaskWS})
11021105
self.instance.groceryService.getWorkspaceForName = mock.Mock(side_effect=[False, mtd[self.sampleMaskWS]])
11031106
self.instance.groceryService.fetchCompatiblePixelMask = mock.Mock(side_effect=lambda n, _, __: n)
1107+
self.instance.groceryService.mantidSnapper.mtd.doesExist = mock.Mock(side_effect=lambda _: True)
1108+
self.instance.groceryService.mantidSnapper.BinaryOperateMasks = mock.Mock()
11041109
# Call the method with the provided parameters
11051110
request = DiffractionCalibrationRequest(
11061111
runNumber="123",

0 commit comments

Comments
 (0)