summaryrefslogtreecommitdiffstats
path: root/pkg/integration
diff options
context:
space:
mode:
authorJesse Duffield <jessedduffield@gmail.com>2023-07-10 18:52:08 +1000
committerJesse Duffield <jessedduffield@gmail.com>2023-07-10 19:13:18 +1000
commit16ed3c23773d5e7b0573c5af805f6a8cb86512ac (patch)
tree9f8e2061837ae982467fdf1137dc3bfde4a28268 /pkg/integration
parentd44d164a5a1b64f71696bdcb89c799d1d3179482 (diff)
Retry on index.lock error
I don't know why we're getting index.lock errors but they're impossile to stop anyway given that other processes can be calling git commands. So we're retrying a few times before re-raising. To do this we need to clone the command and the current implementation for that is best-effort. I do worry about the maintainability of that but we'll see how it goes. Also, I thought you'd need to clone the task (if it exists) but now I think not; as long as you don't call done twice on it you should be fine, and you shouldn't be done'ing a task as part of running a command: that should happen higher up.
Diffstat (limited to 'pkg/integration')
-rw-r--r--pkg/integration/tests/file/discard_changes.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/integration/tests/file/discard_changes.go b/pkg/integration/tests/file/discard_changes.go
index 9d2791fbf..0ddd08675 100644
--- a/pkg/integration/tests/file/discard_changes.go
+++ b/pkg/integration/tests/file/discard_changes.go
@@ -8,7 +8,7 @@ import (
var DiscardChanges = NewIntegrationTest(NewIntegrationTestArgs{
Description: "Discarding all possible permutations of changed files",
ExtraCmdArgs: []string{},
- Skip: true, // failing due to index.lock file being created
+ Skip: false,
SetupConfig: func(config *config.AppConfig) {
},
SetupRepo: func(shell *Shell) {