Fix Windows conflict test failures on main#1777

Merged

teor2345 merged 3 commits intoZcashFoundation:mainfrom teor2345:conflict-fixes

Feb 19, 2021

+52-15

Commits on Feb 19, 2021

Fix conflict test node termination
teor2345
committed
Skip node2.is_running() on Windows
teor2345
committed
remove fail-fast from test job

oxarbitrage
authored and
teor2345
committed