Update functional tests to use builtin FSMonitor present in v2.31.0.vfs.0.0 #491
Conversation
…vfs.0.0) Signed-off-by: Jeff Hostetler <[email protected]>
Signed-off-by: Jeff Hostetler <[email protected]>
Remove watchman axis from test matrix. Add axis to set `git config feature.scalar`. Signed-off-by: Jeff Hostetler <[email protected]>
| else | ||
| { | ||
| error = $"Builtin FSMonitor not supported by this version of Git"; | ||
| this.Context.Tracer.RelatedError(error); | ||
| return false; | ||
| } |
There was a problem hiding this comment.
This causes the Ubuntu builds to break with:
Error: Failed to set initial config: Builtin FSMonitor not supported by this version of Git).
This should just be a warning, then continue to the Watchman integration (if available).
There was a problem hiding this comment.
@derrickstolee Do we want to fall back to watchman here or do we want to amend the test matrix in the .yml to not spawn those cases at all ??
There was a problem hiding this comment.
I think for now, i'll go with your suggestion and fallbakc to Watchman if available. I think longer term we want the feature.scalar=experimental to evolve and test other things.
There was a problem hiding this comment.
Yeah, and the builds won't have Watchman installed, anyway, so they'll be wasted, but 🤷.
Scalar.FunctionalTests/Program.cs
Outdated
| // TODO Do we need to iterate over all of the repos that we created and | ||
| // TODO issue a `git fsmonitor--daemon --stop` on each? Note that we | ||
| // TODO will have code in DeleteEnlistment() to do that during the tests. | ||
|
|
There was a problem hiding this comment.
The DeleteEnlistment() should be sufficient, I think. If we have problems, then we can try to do something here.
…SMonitor Extend definition of `feature.scalar` to select either Watchman or the new builtin FSmonitor. Update the `ConfigStep.cs:TrySetConfig()` to set/unset `core.useBuiltinFSMonitor` when enabling/disabling the builtin `git fsmonitor--daemon`. This feature is new as of Git v2.31.0.vfs.0.0. Previous beta versions of Git used `core.fsmonitor == :internal:` to select it. Also, coordinate values of `core.fsmonitor` with `core.useBuiltinFSMonitor` so that we can select neither or one or the other. Signed-off-by: Jeff Hostetler <[email protected]>
…finished Signed-off-by: Jeff Hostetler <[email protected]>
No description provided.