Closed bgunnar5 closed 3 months ago
@lucpeterson I certainly hope they do, they took forever to put together lol
I might add an integration test that starts with a partially completed workspace, then calls merlin restart
on it just to check that it finished without erroring out.
The tests are throwing some warnings. Unclear if it’s from us or celery tho. Just FYI. They are still passing
@lucpeterson I think the python 3.7 test is throwing warnings since it has an older version of kombu/celery. I think it's time we drop support for 3.7 considering it's already reached EOL. I know 3.8 reaches EOL this year as well but we should probably maintain support for it so long as LC keeps it on systems.
This branch adds the ability to customize how merge conflicts are handled in the
dict_deep_merge
function.This branch also adds new functionality to the test suite by providing the ability to define module-specific pytest fixtures. This will help keep the pytest fixtures more modular going forward.
There are several new tests for reading/writing the status files and also new tests for this conflict handler functionality. There are also new tests for the
dict_deep_merge
function.