From b8c8d1dc2c5fdfe3e8205240db1d4ae1755219bb Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <marcin.grzejszczak@gmail.com>
Date: Mon, 20 Jan 2020 13:06:07 +0100
Subject: [PATCH] Making tests less brittle

---
 .../internal/spring/AbstractSpringAcceptanceTests.java    | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/releaser-test/src/main/java/releaser/internal/spring/AbstractSpringAcceptanceTests.java b/releaser-test/src/main/java/releaser/internal/spring/AbstractSpringAcceptanceTests.java
index 04a46ca0..debf62d0 100644
--- a/releaser-test/src/main/java/releaser/internal/spring/AbstractSpringAcceptanceTests.java
+++ b/releaser-test/src/main/java/releaser/internal/spring/AbstractSpringAcceptanceTests.java
@@ -216,9 +216,13 @@ public abstract class AbstractSpringAcceptanceTests {
 
 	public void checkoutReleaseTrainBranch(String fileToRepo, String branch)
 			throws GitAPIException, URISyntaxException {
-		Git git = GitTestUtils.openGitProject(file(fileToRepo));
+		File file = file(fileToRepo);
+		Git git = GitTestUtils.openGitProject(file);
 		git.reset().setMode(ResetCommand.ResetType.HARD).call();
-		git.checkout().setName(branch).call();
+		if (new File(file, ".travis.yml").exists()) {
+			new File(file, ".travis.yml").delete();
+		}
+		git.checkout().setForce(true).setName(branch).call();
 	}
 
 	public Git clonedProject(NonAssertingTestProjectGitHandler handler, String name) {