Skip to content

Commit e23877f

Browse files
committed
fix(tests): try to fix flaky git sync test
1 parent a951eb8 commit e23877f

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

git-branchless/tests/test_sync.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ fn remove_nondeterministic_lines(output: String) -> String {
88
!line.contains("Fetching")
99
// This line is produced in a different order in some Git versions.
1010
&& !line.contains("Your branch is up to date")
11+
// This line is only sometimes produced in CI for some reason? I
12+
// don't understand how it would only sometimes print this
13+
// message, but it does.
14+
&& !line.contains("Switched to branch")
1115
})
1216
.map(|line| format!("{line}\n"))
1317
.collect()
@@ -369,7 +373,6 @@ fn test_sync_no_delete_main_branch() -> eyre::Result<()> {
369373
branchless: processing 2 updates: branch master, branch should-be-deleted
370374
branchless: creating working copy snapshot
371375
branchless: running command: <git-executable> checkout master
372-
Switched to branch 'master'
373376
branchless: processing checkout
374377
:
375378
@ 96d1c37 (> master) create test2.txt

0 commit comments

Comments
 (0)