Well, I'd still like it in and, assuming people don't mind the test specific hack staying in as it's really a separate issue, I don't think there's much stopping it from going into the spud trunk. The complications will arise when fluidity and the packages are updated to the new version (fluidity options files will have to be updated). So, when this happens we'll just have to remember to run update_options as well but then as diamond in the trunk is currently broken such a release/merge into fluidity shouldn't happen until this is also fixed.
Well, I'd still like it in and, assuming people don't mind the test specific hack staying in as it's really a separate issue, I don't think there's much stopping it from going into the spud trunk. The complications will arise when fluidity and the packages are updated to the new version (fluidity options files will have to be updated). So, when this happens we'll just have to remember to run update_options as well but then as diamond in the trunk is currently broken such a release/merge into fluidity shouldn't happen until this is also fixed.