Pull request #1046: CAS-13818
Merge in CASA/casa6 from CAS-13818 to master
* commit 'b0973d16124b120e2baf377a91488649c0034986': CAS-13818 : Skip failing deconvolve tests CAS-13818 : Fix mask cache conflict on tclean restart CAS-13818: Add test to check for full stokes mask
Added a skip to test_mtmfsimgval_startmodel_axesmismatch in test_task_deconvolve for MacOS due to Fatal Python error. The failure and solution are being investigated on CAS-14117 CAS-13818 : Disable test_imgval_startmodel_axesmismatch on MacOS CAS-13818 : Fix for failing test CAS-13818 : Fix for image.tt0 pb mask
CAS-13818 : Fix mask cache conflict on tclean restart
As documented, the fix for the original issue triggered a mask cache
conflict on restart. In the end the fix turned out to be fairly simple -
check if the mask exists and is valid, and do not touch it if it is.
So in the first instance, when the mask does not exist, it will do the
right thing. And it will not try to do anything on the restart either.
It ended up being a simple inversion of the original logic, with
appropriate traps in place so it works for both the original bug and the
derived bug.