Use chg rather than hg for Send/Receive, saving about 20 seconds per S/R #353
Conversation
LfMergeBridge has become smarter about finding the location of FixFwData so the test that checks what happens if it's missing now has to work a lot harder to hide it. It used to be enough to simply change the current working directory, but now we have to actually hide the FixFwData file AND the FixFwData.exe file by renaming them temporarily.
rmunn
changed the title
src/LfMerge.Core.Tests/Actions/SynchronizeActionBridgeIntegrationTests.cs
Outdated
Show resolved
Hide resolved
This test is checking for a failure condition that no longer happens, and is hard to get running in parallel. We might as well delete it and keep the code simple.
|
Currently blocked by sillsdev/flexbridge#419: test failures are caused by a breaking change in l10nsharp which was fixed by LibChorus version 6.0.0-beta0059, but we've unlisted 6.0.0-beta0059 from nuget.org and so I can't get the fix downloaded in order to make the tests pass. Once we have version 6.0.0-beta0060 of ChorusMerge (and LibChorus, etc) uploaded to NuGet, I'll be able to make these tests pass. |
Later LfMergeBridge NuGet packages were accidentally compiled against a version of Chorus with a breaking change in the localization manager, which causes ChorusMerge failures. We'll pin LfMergeBridge to the version just before the breaking change, just in case.
rmunn
force-pushed
the
chore/bump-mercurial-and-chorus-nuget-packages
branch
from
1cb4f88 to
caf707e
Compare
|
By locking the LfMergeBridge NuGet package to the last version before it accidentally consumed the breaking change in Chorus, we get passing tests and still get the ability to choose chg with environment variables. Going to merge this, and then once the Chorus situation is sorted out and a LibChorus 7.0.0 package is available, we'll be able to upgrade again. |
Will allow speeding up Send/Receive operations by setting the CHORUS_HG_EXE environment variable.
We also need to update one unit test that is now broken because of a change in LfMergeBridge's logic for finding FixFwData. LfMergeBridge used to look for FixFwData in the current working directory only, which made it rather brittle as you had to cd into the right folder before running lfmerge. Now we've improved the logic for finding FixFwData so it's much less brittle. Which means that the test that checks what LfMergeBridge will do when FixFwData is missing, which used to simply cd to an empty directory, now has to do a lot more work to get LfMergeBridge to throw an exception.
Fixes #352.